diff options
| author | Andreas Henriksson | 2017-07-27 16:00:42 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-07-31 15:24:46 +0200 |
| commit | 8df545592d73b67b0bf119732b52a5e4c0662ec4 (patch) | |
| tree | 5a180a226121dce8f51c8653ebdf4b8a1e0f90fe /Makefile.am | |
| parent | whereis: include native multiarch path in lib search paths (diff) | |
| download | kernel-qcow2-util-linux-8df545592d73b67b0bf119732b52a5e4c0662ec4.tar.gz kernel-qcow2-util-linux-8df545592d73b67b0bf119732b52a5e4c0662ec4.tar.xz kernel-qcow2-util-linux-8df545592d73b67b0bf119732b52a5e4c0662ec4.zip | |
build: use --runstatedir instead of --localstatedir
The util-linux code was previously aligned to use @localstatedir@ and
the util-linux build system was set to override the default to use /run.
Current GNU Coding Standards introduced the @runstatedir@ variable
for this purpose. Lets use that instead.
The GNU default for @runstatedir@ is ${localstatedir}/run so util-linux
still override the default to be /run to preserve the status quo from
before. The only difference is that you'll now pass --runstatedir to
override the location on the command line instead of --localstatedir.
(FWIW, Debhelper in compat 11 will automatically start passing
--runstatedir=/run to all autotools configured builds. It already
passes --localstatedir=/var (to avoid it ending up with the GNU default
/usr/local/var) which breaks the util-linux build system code that
tries to default it to /run. This change will thus allow util-linux
and debhelper to work better together and avoid the need for a
package-specific override.)
Relevant historic commits:
* commit 07a16b9d1e5a48550a0d19abb9a900853433ffa2
"build-sys: change --localstatedir to /run"
* commit 80c51185d50f00a2701f9379f10fc48a0f885dfc
"uuidd: use run configured state directory"
* commit 01c5b787947aeaffc7e56000827e3edefa357c59
"agetty: use configured run state directory"
[kzak@redhat.com: - add $runstatedir fallback for autoconf < 2.70
- check for unmodified $localstatedir]
CC: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Andreas Henriksson <andreas@fatal.se>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 54c85e16f..e7657afe9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = \ -include config.h \ -I$(top_srcdir)/include \ -DLOCALEDIR=\"$(localedir)\" \ - -D_PATH_LOCALSTATEDIR=\"${localstatedir}\" + -D_PATH_RUNSTATEDIR=\"${runstatedir}\" AM_CFLAGS = -fsigned-char $(WARN_CFLAGS) AM_LDFLAGS = @@ -119,7 +119,7 @@ edit_cmd = sed \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@includedir[@]|$(includedir)|g' \ - -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@runstatedir[@]|$(runstatedir)|g' \ -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \ -e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \ -e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \ |