chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
acf253b
)
ALL: Add --with-rootlibexecdir and change default to ${libdir}/libexec
author
Sven Eden
<yamakuzure@gmx.net>
Thu, 27 Jul 2017 14:07:50 +0000
(16:07 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Thu, 27 Jul 2017 15:29:54 +0000
(17:29 +0200)
Makefile.am
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 92becb7abc6c548a2e64ddcad9fd36e0c8bff336..484942c269efd746eea46e5d35be1f983b0985e6 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-65,14
+65,16
@@
udevrulesdir=@udevrulesdir@
udevbindir=@udevbindir@
udevlibexecdir=$(udevbindir)
udevhomedir=$(udevlibexecdir)
udevbindir=@udevbindir@
udevlibexecdir=$(udevbindir)
udevhomedir=$(udevlibexecdir)
-systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemsleepdir=$(rootlibexecdir)/system-sleep
factory_pamdir = $(datadir)/factory/etc/pam.d
# And these are the special ones for /
factory_pamdir = $(datadir)/factory/etc/pam.d
# And these are the special ones for /
+
rootprefix=@rootprefix@
rootbindir=$(rootprefix)/bin
rootprefix=@rootprefix@
rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/elogind
+rootlibdir=@rootlibdir@
+rootlibexecdir=@rootlibexecdir@
+systemshutdowndir=$(rootlibexecdir)/system-shutdown
+systemsleepdir=$(rootlibexecdir)/system-sleep
EXTRA_DIST =
BUILT_SOURCES =
EXTRA_DIST =
BUILT_SOURCES =
diff --git
a/configure.ac
b/configure.ac
index e67cbdd607c6e2d8321fe4fb5444adb858c8f1e4..7bb67b71e4bc4bf8c8c6ee8e625c3b33b3207c9b 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-765,6
+765,12
@@
AC_ARG_WITH([rootlibdir],
[with_rootlibdir=${libdir}])
AX_NORMALIZE_PATH([with_rootlibdir])
[with_rootlibdir=${libdir}])
AX_NORMALIZE_PATH([with_rootlibdir])
+AC_ARG_WITH([rootlibexecdir],
+ AS_HELP_STRING([--with-rootlibexecdir=DIR], [Root directory for executables necessary for boot]),
+ [],
+ [with_rootlibexecdir=${libdir}/libexec])
+AX_NORMALIZE_PATH([with_rootlibexecdir])
+
AC_ARG_WITH([pamlibdir],
AS_HELP_STRING([--with-pamlibdir=DIR], [directory for PAM modules]),
[],
AC_ARG_WITH([pamlibdir],
AS_HELP_STRING([--with-pamlibdir=DIR], [directory for PAM modules]),
[],
@@
-848,6
+854,7
@@
AC_SUBST([pamlibdir], [$with_pamlibdir])
AC_SUBST([pamconfdir], [$with_pamconfdir])
AC_SUBST([rootprefix], [$with_rootprefix])
AC_SUBST([rootlibdir], [$with_rootlibdir])
AC_SUBST([pamconfdir], [$with_pamconfdir])
AC_SUBST([rootprefix], [$with_rootprefix])
AC_SUBST([rootlibdir], [$with_rootlibdir])
+AC_SUBST([rootlibexecdir], [$with_rootlibexecdir])
AC_SUBST([cgroup_controller], [$with_cgroupctrl])
AC_CONFIG_FILES([
AC_SUBST([cgroup_controller], [$with_cgroupctrl])
AC_CONFIG_FILES([
@@
-883,6
+890,7
@@
AC_MSG_RESULT([
includedir: . . . . . . . . . . . ${includedir}
lib dir: . . . . . . . . . . . . . ${libdir}
rootlib dir: . . . . . . . . . . . ${with_rootlibdir}
includedir: . . . . . . . . . . . ${includedir}
lib dir: . . . . . . . . . . . . . ${libdir}
rootlib dir: . . . . . . . . . . . ${with_rootlibdir}
+ rootlibexec dir: . . . . . . . . . ${with_rootlibexecdir}
PAM modules dir: . . . . . . . . . ${with_pamlibdir}
PAM configuration dir: . . . . . . ${with_pamconfdir}
D-Bus policy dir: . . . . . . . . ${with_dbuspolicydir}
PAM modules dir: . . . . . . . . . ${with_pamlibdir}
PAM configuration dir: . . . . . . ${with_pamconfdir}
D-Bus policy dir: . . . . . . . . ${with_dbuspolicydir}