From 432a954442800a5be35c8a5d00950056ab4bcf6c Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Thu, 13 Mar 2014 11:29:09 +0200 Subject: [PATCH] build-sys: propagate also sysconfdir to the preprocessor. --- configure.ac | 5 ++++- src/Makefile.am | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9cd0085..ab59774 100644 --- a/configure.ac +++ b/configure.ac @@ -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, diff --git a/src/Makefile.am b/src/Makefile.am index 3db6e44..97fc7fe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 -- 2.7.4