build: move CPP `-D` flag.

The `ULOGD2_LIBDIR` macro is only used in one place, so move the flag
defining it out of the common `regular_CFLAGS` variable to the
`AM_CPPFLAGS` variable in the Makefile where it is needed.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/configure.ac b/configure.ac
index 4e502171292e8e82c78177cdb25d836983bf778d..1d795bad325d32dfd2c5d593d3b8de5ba2504cf9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,7 @@ AC_ARG_WITH([ulogd2libdir],
         [ulogd2libdir="${libdir}/ulogd"])
 AC_SUBST([ulogd2libdir])
 
-regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter -DULOGD2_LIBDIR=\\\"\${ulogd2libdir}\\\"";
+regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter";
 AC_SUBST([regular_CFLAGS])
 
 dnl AC_SUBST(DATABASE_DIR)

diff --git a/src/Makefile.am b/src/Makefile.am
index 998e776a807901ce6c71058219303a14d3b7984c..e1d45aee4b6c9f81ce7e505ad0839ea162bf7758 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,8 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include \
-             -DULOGD_CONFIGFILE="\"$(sysconfdir)/ulogd.conf\"" \
-             -DULOGD_LOGFILE_DEFAULT="\"$(localstatedir)/log/ulogd.log\""
+             -DULOGD_CONFIGFILE='"$(sysconfdir)/ulogd.conf"' \
+             -DULOGD_LOGFILE_DEFAULT='"$(localstatedir)/log/ulogd.log"' \
+             -DULOGD2_LIBDIR='"$(ulogd2libdir)"'
 AM_CFLAGS = ${regular_CFLAGS}
 
 sbin_PROGRAMS = ulogd