From 11f99e06850a7d1242d3dc6427f52eee32256e63 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 4 Nov 2007 22:05:44 -0600 Subject: 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 --- src/pacman/Makefile.am | 2 ++ src/pacman/pacman.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3-24-g4f1b