udevlibexecdir.patch

   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 @@ -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 \
  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 @@ -1906,7 +1906,8 @@
  33         src/udev/keymap/check-keymaps.sh
  34
  35  EXTRA_DIST += \
  36 -       src/udev/keymap/check-keymaps.sh
  37 +       src/udev/keymap/check-keymaps.sh \
  38 +       src/udev/keymap/keyboard-force-release.sh.in
  39
  40  CLEANFILES += \
  41         $(nodist_keymap_SOURCES) \
  42 @@ -1913,7 +1913,7 @@
  43         src/udev/keymap/keys.txt \
  44         src/udev/keymap/keys-from-name.gperf
  45
  46 -udevkeymapdir = $(libexecdir)/udev/keymaps
  47 +udevkeymapdir = $(udevlibexecdir)/keymaps
  48  dist_udevkeymap_DATA = \
  49         keymaps/acer \
  50         keymaps/acer-aspire_5720 \
  51 @@ -1974,7 +1974,7 @@
  52         keymaps/toshiba-satellite_m30x \
  53         keymaps/zepto-znote
  54
  55 -udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
  56 +udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release
  57  dist_udevkeymapforcerel_DATA = \
  58         keymaps-force-release/dell-touchpad \
  59         keymaps-force-release/dell-xps \
  60 @@ -2981,7 +2981,7 @@
  61                 -e 's,@includedir\@,$(includedir),g' \
  62                 -e 's,@VERSION\@,$(VERSION),g' \
  63                 -e 's,@rootprefix\@,$(rootprefix),g' \
  64 -               -e 's,@udevlibexecdir\@,$(libexecdir)/udev,g' \
  65 +               -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
  66                 < $< > $@ || rm $@
  67
  68  units/%: units/%.in Makefile
  69 --- systemd-183/src/udev/keymap/keyboard-force-release.sh~      2012-04-10 22:32:29.934866904 +0200
  70 +++ systemd-183/src/udev/keymap/keyboard-force-release.sh       2012-05-29 12:52:33.283726546 +0200
  71 @@ -6,7 +6,7 @@
  72
  73  case "$2" in
  74          /*) scf="$2" ;;
  75 -        *)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;
  76 +        *)  scf="@udevlibexecdir@/keymaps/force-release/$2" ;;
  77  esac
  78
  79  read attr <"/sys/$1/force_release"