60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
|
From 8e269b13bc042bc2504d5860e0d453b4aac32909 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matthias Reichl <hias@horus.com>
|
||
|
|
Date: Sun, 24 Jun 2018 13:45:26 +0200
|
||
|
|
Subject: [PATCH] backport AC_INIT: add --runstatedir option to configure
|
||
|
|
|
||
|
|
Backport of a197431414088a417b407b9b20583b2e8f7363bd.
|
||
|
|
Changes to NEWS and doc/autoconf.tex have been dropped.
|
||
|
|
---
|
||
|
|
lib/autoconf/general.m4 | 13 ++++++++++++-
|
||
|
|
1 file changed, 12 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
|
||
|
|
index adfae1db..1437c0ca 100644
|
||
|
|
--- a/lib/autoconf/general.m4
|
||
|
|
+++ b/lib/autoconf/general.m4
|
||
|
|
@@ -586,6 +586,7 @@ AC_SUBST([datadir], ['${datarootdir}'])dnl
|
||
|
|
AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl
|
||
|
|
AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
|
||
|
|
AC_SUBST([localstatedir], ['${prefix}/var'])dnl
|
||
|
|
+AC_SUBST([runstatedir], ['${localstatedir}/run'])dnl
|
||
|
|
AC_SUBST([includedir], ['${prefix}/include'])dnl
|
||
|
|
AC_SUBST([oldincludedir], ['/usr/include'])dnl
|
||
|
|
AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
|
||
|
|
@@ -812,6 +813,15 @@ do
|
||
|
|
| -silent | --silent | --silen | --sile | --sil)
|
||
|
|
silent=yes ;;
|
||
|
|
|
||
|
|
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
|
||
|
|
+ | --runstate | --runstat | --runsta | --runst | --runs \
|
||
|
|
+ | --run | --ru | --r)
|
||
|
|
+ ac_prev=runstatedir ;;
|
||
|
|
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||
|
|
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||
|
|
+ | --run=* | --ru=* | --r=*)
|
||
|
|
+ runstatedir=$ac_optarg ;;
|
||
|
|
+
|
||
|
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||
|
|
ac_prev=sbindir ;;
|
||
|
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||
|
|
@@ -921,7 +931,7 @@ fi
|
||
|
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||
|
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||
|
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||
|
|
- libdir localedir mandir
|
||
|
|
+ libdir localedir mandir runstatedir
|
||
|
|
do
|
||
|
|
eval ac_val=\$$ac_var
|
||
|
|
# Remove trailing slashes.
|
||
|
|
@@ -1058,6 +1068,7 @@ Fine tuning of the installation directories:
|
||
|
|
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||
|
|
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||
|
|
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||
|
|
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||
|
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
||
|
|
--includedir=DIR C header files [PREFIX/include]
|
||
|
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||
|
|
--
|
||
|
|
2.11.0
|
||
|
|
|