build-sys: introduce localstatedir

The directory is already used by ./configure.ac, but it has never been
exported to the Makefile.am or used by meson.

Signed-off-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Christian Hesse <mail@eworm.de>
(cherry picked from commit 107b2fbeac3cd6b64c7b2fb40f8ecd0feee220ad)

diff --git a/Makefile.am b/Makefile.am
index 2986006933c89e931ae260b5640f85e9d0bbe1d9..50ab8d0afec8ae00574e7ee0d1222ea082bd50fa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -DLOCALEDIR=\"$(localedir)\" \
        -D_PATH_RUNSTATEDIR=\"${runstatedir}\" \
+       -D_PATH_LOCALSTATEDIR=\"${localstatedir}\" \
        -D_PATH_SYSCONFSTATICDIR=\"${sysconfstaticdir}\"
 
 if USE_VENDORDIR
@@ -175,6 +176,7 @@ edit_cmd = sed \
         -e 's|@docdir[@]|$(docdir)|g' \
         -e 's|@includedir[@]|$(includedir)|g' \
         -e 's|@runstatedir[@]|$(runstatedir)|g' \
+        -e 's|@localstatedir[@]|$(localstatedir)|g' \
         -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \
         -e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \
         -e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \

diff --git a/configure.ac b/configure.ac
index ec79bd4ead300d0df4187ee7c67f2813316c3344..14442a3a8ef7e5671842122d1effffee7df23f2a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,8 @@ AS_CASE([$prefix],
 
   ]
 )
+AC_SUBST([localstatedir])
+
 
 # default for old versions without $runstatedir
 AS_IF([test x"$runstatedir" = x], [runstatedir='${localstatedir}/run'])
@@ -101,7 +103,6 @@ AS_CASE([$localstatedir:$runstatedir],
  [NONE:'${localstatedir}/run' | /var:'${localstatedir}/run' | NONE:'/run' ],
    [runstatedir=/run; AC_MSG_NOTICE([  --runstatedir defaults to /run])]
 )
-
 AC_SUBST([runstatedir])
 
 

diff --git a/libuuid/src/uuidP.h b/libuuid/src/uuidP.h
index fef7e6cb56d6ce18c3b716411a6622d14099c749..6face8215232f945fd9821b1c1631a5ca396e7f8 100644 (file)
--- a/libuuid/src/uuidP.h
+++ b/libuuid/src/uuidP.h
@@ -39,8 +39,8 @@
 
 #include "uuid.h"
 
-#define LIBUUID_CLOCK_FILE     "/var/lib/libuuid/clock.txt"
-#define LIBUUID_CLOCK_CONT_FILE        "/var/lib/libuuid/clock-cont.txt"
+#define LIBUUID_CLOCK_FILE     _PATH_LOCALSTATEDIR "/lib/libuuid/clock.txt"
+#define LIBUUID_CLOCK_CONT_FILE        _PATH_LOCALSTATEDIR "/lib/libuuid/clock-cont.txt"
 
 /*
  * Offset between 15-Oct-1582 and 1-Jan-70

diff --git a/meson.build b/meson.build
index b13c060dc1005f6798bfbf7688b5053a5d71d058..964c8d91264bc907c72a007d3c9ab544e407423c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -28,6 +28,7 @@ sysconfstaticdir = join_paths(prefixdir, 'lib')
 docdir = join_paths(prefixdir, get_option('datadir'), 'doc', 'util-linux')
 mandir = join_paths(prefixdir, get_option('mandir'))
 runstatedir = '/run'
+localstatedir = '/var'
 execprefixdir = prefixdir
 sysconfdir = join_paths(prefixdir, get_option('sysconfdir'))
 usrbin_exec_dir = join_paths(execprefixdir, bindir)
@@ -61,12 +62,14 @@ conf.set_quoted('LIBBLKID_DATE', libblkid_date)
 conf.set('bindir', bindir)
 conf.set('sbindir', sbindir)
 conf.set('runstatedir', runstatedir)
+conf.set('localstatedir', localstatedir)
 conf.set('sysconfdir', sysconfdir)
 conf.set('usrbin_execdir', usrbin_exec_dir)
 conf.set('usrsbin_execdir', usrsbin_exec_dir)
 conf.set('docdir', docdir)
 conf.set_quoted('_PATH_SYSCONFSTATICDIR', sysconfstaticdir)
 conf.set_quoted('_PATH_RUNSTATEDIR', runstatedir)
+conf.set_quoted('_PATH_LOCALSTATEDIR', localstatedir)
 conf.set_quoted('CONFIG_ADJTIME_PATH', '/etc/adjtime')
 conf.set_quoted('ADJTIME_PATH', '/etc/adjtime') # yes, both are used :(
 

diff --git a/misc-utils/uuidd-tmpfiles.conf.in b/misc-utils/uuidd-tmpfiles.conf.in
index 9c2005bdff3e43a5d3e01b13b9ad46f1a39f33fe..b362930d8b2c55918b87084fd0490b49b5f6b3e2 100644 (file)
--- a/misc-utils/uuidd-tmpfiles.conf.in
+++ b/misc-utils/uuidd-tmpfiles.conf.in
@@ -3,4 +3,4 @@
 # See tmpfiles.d(5) for details
 #
 d @runstatedir@/uuidd 2775 uuidd uuidd -
-d /var/lib/libuuid 0755 uuidd uuidd -
+d @localstatedir@/lib/libuuid 0755 uuidd uuidd -