]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
build-sys: introduce $sysconfstaticdir
authorKarel Zak <kzak@redhat.com>
Mon, 11 Nov 2019 12:08:04 +0000 (13:08 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 12 Nov 2019 09:09:34 +0000 (10:09 +0100)
The current situation is that distros differentiate between:

* host specific configuration -- usually /etc, maintained by admin

* distribution specific (static) configuration -- usually /usr/lib,
  maintained by ditro packages

Unfortunately autotools have clue about $sysconfdir (/etc) only. This
patch introduces $sysconfstaticdir (default $prefix/lib).

Signed-off-by: Karel Zak <kzak@redhat.com>
Makefile.am
configure.ac

index 9ef752f3c73c84e5f001c94634df92d1ea4b6e18..95e832cdc2871c263f36738cfe8242f7657ca708 100644 (file)
@@ -2,7 +2,9 @@ AM_CPPFLAGS = \
        -include config.h \
        -I$(top_srcdir)/include \
        -DLOCALEDIR=\"$(localedir)\" \
-       -D_PATH_RUNSTATEDIR=\"${runstatedir}\"
+       -D_PATH_RUNSTATEDIR=\"${runstatedir}\" \
+       -D_PATH_SYSCONFSTATICDIR=\"${sysconfstaticdir}\"
+
 AM_CFLAGS = -fsigned-char $(WARN_CFLAGS)
 AM_LDFLAGS = $(ASAN_LDFLAGS)
 
index f70f8d1eeaa93a099ee58455bafe0062c09c181e..e8a03bf0096d9eac7b353891b25be54ef5df5560 100644 (file)
@@ -101,6 +101,14 @@ AS_CASE([$libdir],
 )
 AC_SUBST([usrlib_execdir])
 
+# static configuration maintaned by packages (e.g. /usr/lib)
+AC_ARG_VAR([SYSCONFSTATICDIR],
+          [Path to static system configuration, default ${prefix}/lib])
+AS_IF([test "x$SYSCONFSTATICDIR" = x],
+      [sysconfstaticdir='${prefix}/lib'],
+      [sysconfstaticdir=$SYSCONFSTATICDIR])
+AC_SUBST([sysconfstaticdir])
+
 
 AM_PROG_CC_C_O
 AC_PROG_MKDIR_P