diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-06-10 17:23:43 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-06-10 17:23:43 +0200 |
| commit | 8e8eb8fbafcaa841fa5393e396acde27b26edf2f (patch) | |
| tree | c0188832e14fe4a8eac12541e1fc0176be4ee69c /Makefile.am | |
| parent | 7a5498fe926eb41520c3e4b0e97ff8359ae37e9e (diff) | |
udev: always use $(rootprefix)/lib/udev for libexecdir
On Sat, Jun 9, 2012 at 12:46 AM, Malte Starostik <lists@malte.homeip.net> wrote:
> From: Malte Starostik <m-starostik@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.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index f45fa27475..98a85063ca 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,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \ -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \ -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ - -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \ -e 's,@systemunitdir\@,$(systemunitdir),g' \ -e 's,@userunitdir\@,$(userunitdir),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ @@ -3001,7 +2999,7 @@ SED_PROCESS = \ -e 's,@includedir\@,$(includedir),g' \ -e 's,@VERSION\@,$(VERSION),g' \ -e 's,@rootprefix\@,$(rootprefix),g' \ - -e 's,@udevlibexecdir\@,$(libexecdir)/udev,g' \ + -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \ -e 's,@sushell\@,$(sushell),g' \ < $< > $@ || rm $@ |