summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-06-19 15:28:22 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-06-24 13:07:58 +0800
commit56294d02a1422a3e83d2507c462ce53091135fa1 (patch)
treefc31fa62f2f80fc1058c63b6276b39c8be613709
parentc11bcba9a99e858e618f4d872a5be7d52dcaaa5a (diff)
downloadtalos-petitboot-56294d02a1422a3e83d2507c462ce53091135fa1.tar.gz
talos-petitboot-56294d02a1422a3e83d2507c462ce53091135fa1.zip
Add pkgsysconfdir
We'll need a sysconf dir to store the boot hooks. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-rw-r--r--configure.ac.in1
-rw-r--r--discover/Makefile.am3
2 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac.in b/configure.ac.in
index 1d6703b..51cfdb8 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -219,6 +219,7 @@ AS_IF(
AC_SUBST([LIBTOOL_DEPS])
AC_SUBST([DESTDIR])
+AC_SUBST([pkgsysconfdir], ["${sysconfdir}/${package}"])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([
diff --git a/discover/Makefile.am b/discover/Makefile.am
index a449818..0feb3e5 100644
--- a/discover/Makefile.am
+++ b/discover/Makefile.am
@@ -12,11 +12,14 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+pkgsysconfdir = @sysconfdir@/@PACKAGE@
+
AM_CPPFLAGS = -I$(top_srcdir)/lib $(DEFAULT_CPPFLAGS)
AM_CFLAGS = $(DEFAULT_CFLAGS) \
-DPREFIX='"$(prefix)"' \
-DPKG_SHARE_DIR='"$(pkgdatadir)"' \
+ -DPKG_SYSCONF_DIR='"$(pkgsysconfdir)"' \
-DLOCAL_STATE_DIR='"$(localstatedir)"'
noinst_LIBRARIES = libparser.o
OpenPOWER on IntegriCloud