diff options
author | Karel Zak <kzak@redhat.com> | 2024-02-28 13:07:39 +0100 |
---|---|---|
committer | Christian Hesse <mail@eworm.de> | 2024-02-28 15:42:09 +0100 |
commit | 107b2fbeac3cd6b64c7b2fb40f8ecd0feee220ad (patch) | |
tree | 3c646b3c5333efdb74284aeba45940ff33ba7b3f | |
parent | 306cd7c7ce2920bbc204c6e404e3480e132ff1dd (diff) | |
download | util-linux-107b2fbeac3cd6b64c7b2fb40f8ecd0feee220ad.tar.gz |
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>
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | libuuid/src/uuidP.h | 4 | ||||
-rw-r--r-- | meson.build | 3 | ||||
-rw-r--r-- | misc-utils/uuidd-tmpfiles.conf.in | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 2986006933..50ab8d0afe 100644 --- 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 82dee7f04d..ab7c986367 100644 --- 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 fef7e6cb56..6face82152 100644 --- 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 ffa959b40f..2b84f9a88e 100644 --- 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 9c2005bdff..b362930d8b 100644 --- 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 - |