projects / packages / systemd.git / blame
| Commit | Line | Data |
|---|---|---|
| 1d5c36d2 JR |
1 | --- systemd-183/Makefile.am~ 2012-05-28 12:46:43.097747775 +0200 |
| 2 | +++ systemd-183/Makefile.am 2012-05-28 13:02:55.879128360 +0200 | |
| 3 | @@ -70,8 +70,8 @@ | |
| 4 | systemsleepdir=$(rootlibexecdir)/system-sleep | |
| 5 | systemunitdir=$(rootprefix)/lib/systemd/system | |
| 6 | udevlibexecdir=$(rootprefix)/lib/udev | |
| 7 | -udevhomedir = $(libexecdir)/udev | |
| 8 | -udevrulesdir = $(libexecdir)/udev/rules.d | |
| 9 | +udevhomedir=$(udevlibexecdir) | |
| 10 | +udevrulesdir=$(udevlibexecdir)/rules.d | |
| 11 | ||
| 12 | # And these are the special ones for / | |
| 13 | rootprefix=@rootprefix@ | |
| 13fa9695 JR |
14 | @@ -131,7 +131,7 @@ |
| 15 | -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \ | |
| 16 | -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \ | |
| 17 | -DX_SERVER=\"$(bindir)/X\" \ | |
| 18 | - -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \ | |
| 19 | + -DUDEVLIBEXECDIR=\""$(udevlibexecdir)"\" \ | |
| 20 | -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ | |
| 21 | -I $(top_srcdir)/src \ | |
| 22 | -I $(top_srcdir)/src/shared \ | |
| 1d5c36d2 JR |
23 | @@ -1434,7 +1434,7 @@ |
| 24 | ||
| 25 | udev-confdirs: | |
| 26 | -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d | |
| 27 | - -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices | |
| 28 | + -mkdir -p $(DESTDIR)$(udevlibexecdir)/devices | |
| 29 | ||
| 30 | INSTALL_DATA_HOOKS += udev-confdirs | |
| 31 | ||
| 32 | @@ -1913,7 +1913,7 @@ | |
| 33 | src/udev/keymap/keys.txt \ | |
| 34 | src/udev/keymap/keys-from-name.gperf | |
| 35 | ||
| 36 | -udevkeymapdir = $(libexecdir)/udev/keymaps | |
| 37 | +udevkeymapdir = $(udevlibexecdir)/keymaps | |
| 38 | dist_udevkeymap_DATA = \ | |
| 39 | keymaps/acer \ | |
| 40 | keymaps/acer-aspire_5720 \ | |
| 41 | @@ -1974,7 +1974,7 @@ | |
| 42 | keymaps/toshiba-satellite_m30x \ | |
| 43 | keymaps/zepto-znote | |
| 44 | ||
| 45 | -udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release | |
| 46 | +udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release | |
| 47 | dist_udevkeymapforcerel_DATA = \ | |
| 48 | keymaps-force-release/dell-touchpad \ | |
| 49 | keymaps-force-release/dell-xps \ | |
| 13fa9695 JR |
50 | @@ -2981,7 +2981,7 @@ |
| 51 | -e 's,@includedir\@,$(includedir),g' \ | |
| 52 | -e 's,@VERSION\@,$(VERSION),g' \ | |
| 53 | -e 's,@rootprefix\@,$(rootprefix),g' \ | |
| 54 | - -e 's,@udevlibexecdir\@,$(libexecdir)/udev,g' \ | |
| 55 | + -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \ | |
| 56 | < $< > $@ || rm $@ | |
| 57 | ||
| 58 | units/%: units/%.in Makefile |