[systemd-commits] autogen.sh configure.ac Makefile.am

[Kay Sievers]

 Makefile.am  |   16 +++++++---------
 autogen.sh   |    1 -
 configure.ac |    1 -
 3 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 8e8eb8fbafcaa841fa5393e396acde27b26edf2f
Author: Kay Sievers <kay at vrfy.org>
Date:   Sun Jun 10 17:23:43 2012 +0200

    udev: always use $(rootprefix)/lib/udev for libexecdir
    
    On Sat, Jun 9, 2012 at 12:46 AM, Malte Starostik <lists at malte.homeip.net> wrote:
    > From: Malte Starostik <m-starostik at versanet.de>
    >
    > Rules get installed in $(libexecdir)/udev/, so are keymaps.  Helper
    > binaries go to $(rootprefix)/lib/udev though.  Problem is, in the code,
    > both are referenced via UDEVLIBEXECDIR which is defined to the former
    > location.  Result: systemd-udev can't find e.g. the keymap binary to
    > apply keymaps.

diff --git a/Makefile.am b/Makefile.am
index f45fa27..98a8506 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,15 +63,15 @@ pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
-usergeneratordir=$(pkglibexecdir)/user-generators
+usergeneratordir=$(prefix)/lib/systemd/user-generators
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
 udevlibexecdir=$(rootprefix)/lib/udev
-udevhomedir = $(libexecdir)/udev
-udevrulesdir = $(libexecdir)/udev/rules.d
+udevhomedir = $(udevlibexecdir)
+udevrulesdir = $(udevlibexecdir)/rules.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -132,7 +132,7 @@ AM_CPPFLAGS = \
 	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
 	-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
 	-DX_SERVER=\"$(bindir)/X\" \
-	-DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
+	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
 	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
 	-I $(top_srcdir)/src \
 	-I $(top_srcdir)/src/shared \
@@ -1422,7 +1422,6 @@ MANPAGES += \
 
 udev-confdirs:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
-	-mkdir -p $(DESTDIR)$(libexecdir)/udev/devices
 
 INSTALL_DATA_HOOKS += udev-confdirs
 
@@ -1903,7 +1902,7 @@ CLEANFILES += \
 	src/udev/keymap/keys-from-name.gperf \
 	src/udev/keymap/keyboard-force-release.sh
 
-udevkeymapdir = $(libexecdir)/udev/keymaps
+udevkeymapdir = $(udevlibexecdir)/keymaps
 dist_udevkeymap_DATA = \
 	keymaps/acer \
 	keymaps/acer-aspire_5720 \
@@ -1964,7 +1963,7 @@ dist_udevkeymap_DATA = \
 	keymaps/toshiba-satellite_m30x \
 	keymaps/zepto-znote
 
-udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
+udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
 	keymaps-force-release/dell-touchpad \
 	keymaps-force-release/dell-xps \
@@ -2988,7 +2987,6 @@ SED_PROCESS = \
 		-e 's, at SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
 		-e 's, at pkgsysconfdir\@,$(pkgsysconfdir),g' \
 		-e 's, at pkgdatadir\@,$(pkgdatadir),g' \
-		-e 's, at pkglibexecdir\@,$(pkglibexecdir),g' \
 		-e 's, at systemunitdir\@,$(systemunitdir),g' \
 		-e 's, at userunitdir\@,$(userunitdir),g' \
 		-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
@@ -3001,7 +2999,7 @@ SED_PROCESS = \
 		-e 's, at includedir\@,$(includedir),g' \
 		-e 's, at VERSION\@,$(VERSION),g' \
 		-e 's, at rootprefix\@,$(rootprefix),g' \
-		-e 's, at udevlibexecdir\@,$(libexecdir)/udev,g' \
+		-e 's, at udevlibexecdir\@,$(udevlibexecdir),g' \
 		-e 's, at sushell\@,$(sushell),g' \
 		< $< > $@ || rm $@
 
diff --git a/autogen.sh b/autogen.sh
index 0b5d9b5..f9ad5f0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -41,7 +41,6 @@ args="\
 --sysconfdir=/etc \
 --localstatedir=/var \
 --libdir=$(libdir /usr/lib) \
---libexecdir=/usr/lib \
 $gtkdocargs"
 
 if [ ! -L /bin ]; then
diff --git a/configure.ac b/configure.ac
index 70f3e96..2bb50c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -747,7 +747,6 @@ AC_MSG_RESULT([
         datarootdir:             ${datarootdir}
         includedir:              ${includedir}
         include_prefix:          ${INCLUDE_PREFIX}
-        libexec dir:             ${libexecdir}
         lib dir:                 ${libdir}
         rootlib dir:             ${with_rootlibdir}
         PAM modules dir:         ${with_pamlibdir}