diff options
| author | Dan McGee <dan@archlinux.org> | 2007-11-05 05:05:44 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-11-06 04:10:22 +0100 |
| commit | 11f99e06850a7d1242d3dc6427f52eee32256e63 (patch) | |
| tree | d59708aac64d96215f2b1f6a0cef7562c11994df /src | |
| parent | 0686fec8399e01adacd1633d6ad624ee2d5b6d9c (diff) | |
| download | pacman-11f99e06850a7d1242d3dc6427f52eee32256e63.tar.gz pacman-11f99e06850a7d1242d3dc6427f52eee32256e63.tar.xz | |
Add LOGFILE as a define at compile time for pacman
It has always been a bit odd that logfile had to be specified in the config
file, but no other paths did. Add LOGFILE as a preprocessor definition, and
make a call to alpm_option_set_logfile() to set the default location so no
logfile parameter is necessary in pacman.conf.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/Makefile.am | 2 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index d0b727f6..0395432e 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -2,6 +2,7 @@ conffile = ${sysconfdir}/pacman.conf dbpath = ${localstatedir}/lib/pacman/ cachedir = ${localstatedir}/cache/pacman/pkg/ +logfile = ${localstatedir}/log/pacman.log bin_PROGRAMS = pacman @@ -14,6 +15,7 @@ DEFS = -DLOCALEDIR=\"@localedir@\" \ -DROOTDIR=\"$(ROOTDIR)\" \ -DDBPATH=\"$(dbpath)\" \ -DCACHEDIR=\"$(cachedir)\" \ + -DLOGFILE=\"$(logfile)\" \ @DEFS@ INCLUDES = -I$(top_srcdir)/lib/libalpm diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index befd0219..9c650f21 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -776,9 +776,10 @@ int main(int argc, char *argv[]) /* Setup logging as soon as possible, to print out maximum debugging info */ alpm_option_set_logcb(cb_log); alpm_option_set_dlcb(cb_dl_progress); - /* define root and dbpath to reasonable defaults */ + /* define paths to reasonable defaults */ alpm_option_set_root(ROOTDIR); alpm_option_set_dbpath(DBPATH); + alpm_option_set_logfile(LOGFILE); /* Priority of options: * 1. command line |