From: Jeremy Sowden Date: Sun, 14 Nov 2021 15:52:21 +0000 (+0000) Subject: build: move CPP `-D` flag. X-Git-Tag: ulogd-2.0.8~66 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=820438083eb04abf8efc722fbbe0fdab7c88163d;p=thirdparty%2Fulogd2.git 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 Signed-off-by: Pablo Neira Ayuso --- diff --git a/configure.ac b/configure.ac index 4e50217..1d795ba 100644 --- 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 998e776..e1d45ae 100644 --- 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