build-sys: propagate also sysconfdir to the preprocessor.
authorKrisztian Litkey <krisztian.litkey@intel.com>
Thu, 13 Mar 2014 09:29:09 +0000 (11:29 +0200)
committerKrisztian Litkey <krisztian.litkey@intel.com>
Thu, 13 Mar 2014 09:29:09 +0000 (11:29 +0200)
configure.ac
src/Makefile.am

index 9cd0085..ab59774 100644 (file)
@@ -401,10 +401,13 @@ MURPHY_LIBS=""
 AC_SUBST(MURPHY_CFLAGS)
 AC_SUBST(MURPHY_LIBS)
 
-# Add LIBDIR to config.h.
+# Allow substitution for LIBDIR and SYSCONFDIR.
 AC_MSG_CHECKING([libdir])
 AC_MSG_RESULT([$libdir])
 AC_SUBST(LIBDIR, [$libdir])
+AC_MSG_CHECKING([sysconfdir])
+AC_MSG_RESULT([$sysconfdir])
+AC_SUBST(SYSCONFDIR, [$sysconfdir])
 
 #Check whether we build resources or not
 AC_ARG_WITH(resources,
index 3db6e44..97fc7fe 100644 (file)
@@ -5,7 +5,8 @@ SUBDIRS         = murphy-db . \
 
 BUILT_SOURCES   =
 
-AM_CFLAGS       = $(WARNING_CFLAGS) $(INCLUDES) -DLIBDIR=\"@LIBDIR@\"
+AM_CFLAGS       = $(WARNING_CFLAGS) $(INCLUDES) \
+                 -DSYSCONFDIR=\"@SYSCONFDIR@\" -DLIBDIR=\"@LIBDIR@\"
 MURPHY_CFLAGS   =
 pkgconfigdir    = ${libdir}/pkgconfig