]>
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@ | |
14 | @@ -1434,7 +1434,7 @@ | |
15 | ||
16 | udev-confdirs: | |
17 | -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d | |
18 | - -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices | |
19 | + -mkdir -p $(DESTDIR)$(udevlibexecdir)/devices | |
20 | ||
21 | INSTALL_DATA_HOOKS += udev-confdirs | |
22 | ||
23 | @@ -1913,7 +1913,7 @@ | |
24 | src/udev/keymap/keys.txt \ | |
25 | src/udev/keymap/keys-from-name.gperf | |
26 | ||
27 | -udevkeymapdir = $(libexecdir)/udev/keymaps | |
28 | +udevkeymapdir = $(udevlibexecdir)/keymaps | |
29 | dist_udevkeymap_DATA = \ | |
30 | keymaps/acer \ | |
31 | keymaps/acer-aspire_5720 \ | |
32 | @@ -1974,7 +1974,7 @@ | |
33 | keymaps/toshiba-satellite_m30x \ | |
34 | keymaps/zepto-znote | |
35 | ||
36 | -udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release | |
37 | +udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release | |
38 | dist_udevkeymapforcerel_DATA = \ | |
39 | keymaps-force-release/dell-touchpad \ | |
40 | keymaps-force-release/dell-xps \ |