From: Hideki Yamane <henrich@debian.org>
Date: Sat, 27 Jan 2018 17:05:28 +0000 (+0900)
Subject: enable to set Global configuration file correctly
X-Git-Tag: v0.5.4~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f40ce8a6b2fe8f07cf0037c37729f5791adcbce;p=thirdparty%2Fsnapper.git

enable to set Global configuration file correctly

--with-conf option can set Global configuration file directory, but manpage
still specifies static /etc/sysconfig/.
---

diff --git a/configure.ac b/configure.ac
index 2a4e98f7..3c54c502 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,11 +58,15 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 CFLAGS="${CFLAGS} -std=c99 -Wall -Wextra -Wformat=2 -Wmissing-prototypes -Wno-unused-parameter"
 CXXFLAGS="${CXXFLAGS} -std=c++11 -Wall -Wextra -Wformat=2 -Wnon-virtual-dtor -Wno-unused-parameter"
 
+SYSCONFIG=/etc/sysconfig
+
 AC_ARG_WITH([conf], AC_HELP_STRING([--with-conf], [Use a custom sysconfig directory (default is /etc/sysconfig)]),
 	[with_conf=$withval], [with_conf=no])
 
-AS_IF([test "x$with_conf" != xno], [CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"${with_conf}\"'"],
-	[CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"/etc/sysconfig\"'"])
+AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"])
+
+CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"${SYSCONFIG}\"'"
+
 
 AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]),
 		[with_btrfs=$enableval],[with_btrfs=yes])
@@ -151,6 +155,7 @@ AC_SUBST(LIBVERSION_MAJOR)
 AC_SUBST(LIBVERSION_MINOR)
 AC_SUBST(LIBVERSION_PATCHLEVEL)
 AC_SUBST(LIBVERSION_INFO)
+AC_SUBST(SYSCONFIG)
 AC_SUBST(docdir)
 
 AC_OUTPUT(
diff --git a/doc/snapper.xml.in b/doc/snapper.xml.in
index 1507b5d6..9073ab32 100644
--- a/doc/snapper.xml.in
+++ b/doc/snapper.xml.in
@@ -686,7 +686,7 @@
     <title>FILES</title>
     <variablelist>
       <varlistentry>
-	<term><filename>/etc/sysconfig/snapper</filename></term>
+	<term><filename>@SYSCONFIG@/snapper</filename></term>
 	<listitem>
 	  <para>Global configuration file.</para>
 	</listitem>