From de6a9db8d3a687521a89690e395939d6feb24bb1 Mon Sep 17 00:00:00 2001 From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org" Date: Tue, 23 May 2006 08:41:28 +0000 Subject: move definition of ULOGD_LOGFILE_DEFAULT and ULOGD_CONFIGFILE to Makefile.am, Set default config and log files based on configure. Note that these defines cannot be placed in config.h, since they depend on the prefix, which must be expanded by make. (Philip Craig) --- src/Makefile.am | 4 +++- src/ulogd.c | 10 ---------- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 783f153..8093aef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,7 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include \ + -DULOGD_CONFIGFILE="\"$(sysconfdir)/ulogd.conf\"" \ + -DULOGD_LOGFILE_DEFAULT="\"$(localstatedir)/log/ulogd.log\"" sbin_PROGRAMS = ulogd diff --git a/src/ulogd.c b/src/ulogd.c index b408fe9..2dc597b 100644 --- a/src/ulogd.c +++ b/src/ulogd.c @@ -69,16 +69,6 @@ #define DEBUGP(format, args...) #endif -/* default config parameters, if not changed in configfile */ -#ifndef ULOGD_LOGFILE_DEFAULT -#define ULOGD_LOGFILE_DEFAULT "/var/log/ulogd.log" -#endif - -/* where to look for the config file */ -#ifndef ULOGD_CONFIGFILE -#define ULOGD_CONFIGFILE "/usr/local/etc/ulogd.conf" -#endif - #define COPYRIGHT \ "Copyright (C) 2000-2005 Harald Welte \n" -- cgit v1.2.3