build-sys: use --libexecdir=/usr/lib instead of /usr/lib/udev

diff --git a/INSTALL b/INSTALL
index 5fa900b190dfde0e569c100c1a03080a0b921d11..59abf7c92f787f05e153bb0b7891a6365a597add 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ The options used used usually look like:
     --sysconfdir=/etc \
     --bindir=/usr/bin \
     --libdir=/usr/lib64 \
     --sysconfdir=/etc \
     --bindir=/usr/bin \
     --libdir=/usr/lib64 \

-    --libexecdir=/usr/lib/udev \
+    --libexecdir=/usr/lib \

     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --with-selinux
 
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --with-selinux
 


@@ -14,7 +14,7 @@ The options used in a RPM spec file look like:
     --sysconfdir=%{_sysconfdir} \
     --bindir=%{_bindir} \
     --libdir=%{_libdir} \
     --sysconfdir=%{_sysconfdir} \
     --bindir=%{_bindir} \
     --libdir=%{_libdir} \

-    --libexecdir=%{_prefix}/lib/udev \
+    --libexecdir=%{_prefix}/lib \

     --with-systemdsystemunitdir=%{_prefix}/lib/systemd/system \
     --with-selinux
 
     --with-systemdsystemunitdir=%{_prefix}/lib/systemd/system \
     --with-selinux
 


@@ -26,7 +26,7 @@ and udevadm in /sbin:
     --bindir=/sbin \
     --libdir=%{_libdir} \
     --with-rootlibdir=/lib64 \
     --bindir=/sbin \
     --libdir=%{_libdir} \
     --with-rootlibdir=/lib64 \

-    --libexecdir=/lib/udev \
+    --libexecdir=/lib \

     --with-systemdsystemunitdir=/lib/systemd/system \
     --with-selinux
 
     --with-systemdsystemunitdir=/lib/systemd/system \
     --with-selinux
 

diff --git a/Makefile.am b/Makefile.am
index d95a3619a9b97ca81f232ce12edd5be769556f1c..7abad22a61b652fe4018284112881d26f857ca96 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -I$(top_srcdir)/libudev \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
        -include $(top_builddir)/config.h \
        -I$(top_srcdir)/libudev \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \

-       -DLIBEXECDIR=\""$(libexecdir)"\"
+       -DPKGLIBEXECDIR=\""$(libexecdir)/udev"\"

 
 AM_CFLAGS = \
        ${my_CFLAGS} \
 
 AM_CFLAGS = \
        ${my_CFLAGS} \


@@ -36,8 +36,9 @@ INSTALL_EXEC_HOOKS =
 INSTALL_DATA_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 DISTCHECK_HOOKS =
 INSTALL_DATA_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 DISTCHECK_HOOKS =

-libexec_SCRIPTS =
-dist_libexec_SCRIPTS =
+pkglibexec_SCRIPTS =
+dist_pkglibexec_SCRIPTS =
+dist_pkglibexec_DATA =

 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \


@@ -48,7 +49,7 @@ SED_PROCESS = \
        -e 's,@libdir\@,$(libdir),g' \
        -e 's,@includedir\@,$(includedir),g' \
        -e 's,@bindir\@,$(bindir),g' \
        -e 's,@libdir\@,$(libdir),g' \
        -e 's,@includedir\@,$(includedir),g' \
        -e 's,@bindir\@,$(bindir),g' \

-       -e 's,@libexecdir\@,$(libexecdir),g' \
+       -e 's,@pkglibexecdir\@,$(libexecdir)/udev,g' \

        < $< > $@ || rm $@
 
 %.pc: %.pc.in Makefile
        < $< > $@ || rm $@
 
 %.pc: %.pc.in Makefile


@@ -135,7 +136,7 @@ UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
 # ------------------------------------------------------------------------------
 udev-confdirs:
        -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
 # ------------------------------------------------------------------------------
 udev-confdirs:
        -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d

-       -mkdir -p $(DESTDIR)$(libexecdir)/devices
+       -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices

 
 INSTALL_DATA_HOOKS += udev-confdirs
 
 
 INSTALL_DATA_HOOKS += udev-confdirs
 


@@ -143,7 +144,7 @@ EXTRA_DIST += \
        rules/arch \
        rules/misc
 
        rules/arch \
        rules/misc
 

-udevrulesdir = $(libexecdir)/rules.d
+udevrulesdir = $(libexecdir)/udev/rules.d

 dist_udevrules_DATA = \
        rules/rules.d/50-udev-default.rules \
        rules/rules.d/60-persistent-storage-tape.rules \
 dist_udevrules_DATA = \
        rules/rules.d/50-udev-default.rules \
        rules/rules.d/60-persistent-storage-tape.rules \


@@ -199,7 +200,7 @@ endif
 bin_PROGRAMS = \
        udev/udevadm
 
 bin_PROGRAMS = \
        udev/udevadm
 

-libexec_PROGRAMS = \
+pkglibexec_PROGRAMS = \

        udev/udevd
 
 udev_common_sources = \
        udev/udevd
 
 udev_common_sources = \


@@ -311,14 +312,14 @@ udev_test_udev_CPPFLAGS = $(udev_common_CPPFLAGS)
 # ------------------------------------------------------------------------------
 extras_ata_id_ata_id_SOURCES = extras/ata_id/ata_id.c
 extras_ata_id_ata_id_LDADD = libudev/libudev-private.la
 # ------------------------------------------------------------------------------
 extras_ata_id_ata_id_SOURCES = extras/ata_id/ata_id.c
 extras_ata_id_ata_id_LDADD = libudev/libudev-private.la

-libexec_PROGRAMS += extras/ata_id/ata_id
+pkglibexec_PROGRAMS += extras/ata_id/ata_id

 
 # ------------------------------------------------------------------------------
 # cdrom_id - optical drive/media capability
 # ------------------------------------------------------------------------------
 extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c
 extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la
 
 # ------------------------------------------------------------------------------
 # cdrom_id - optical drive/media capability
 # ------------------------------------------------------------------------------
 extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c
 extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la

-libexec_PROGRAMS += extras/cdrom_id/cdrom_id
+pkglibexec_PROGRAMS += extras/cdrom_id/cdrom_id

 dist_udevrules_DATA += extras/cdrom_id/60-cdrom_id.rules
 
 # ------------------------------------------------------------------------------
 dist_udevrules_DATA += extras/cdrom_id/60-cdrom_id.rules
 
 # ------------------------------------------------------------------------------


@@ -326,7 +327,7 @@ dist_udevrules_DATA += extras/cdrom_id/60-cdrom_id.rules
 # ------------------------------------------------------------------------------
 extras_collect_collect_SOURCES = extras/collect/collect.c
 extras_collect_collect_LDADD = libudev/libudev-private.la
 # ------------------------------------------------------------------------------
 extras_collect_collect_SOURCES = extras/collect/collect.c
 extras_collect_collect_LDADD = libudev/libudev-private.la

-libexec_PROGRAMS += extras/collect/collect
+pkglibexec_PROGRAMS += extras/collect/collect

 
 # ------------------------------------------------------------------------------
 # scsi_id - SCSI inquiry to get various serial numbers
 
 # ------------------------------------------------------------------------------
 # scsi_id - SCSI inquiry to get various serial numbers


@@ -337,7 +338,7 @@ extras_scsi_id_scsi_id_SOURCES =\
        extras/scsi_id/scsi.h \
        extras/scsi_id/scsi_id.h
 extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
        extras/scsi_id/scsi.h \
        extras/scsi_id/scsi_id.h
 extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la

-libexec_PROGRAMS += extras/scsi_id/scsi_id
+pkglibexec_PROGRAMS += extras/scsi_id/scsi_id

 dist_man_MANS += extras/scsi_id/scsi_id.8
 EXTRA_DIST += extras/scsi_id/README
 
 dist_man_MANS += extras/scsi_id/scsi_id.8
 EXTRA_DIST += extras/scsi_id/README
 


@@ -346,7 +347,7 @@ EXTRA_DIST += extras/scsi_id/README
 # ------------------------------------------------------------------------------
 extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c
 extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
 # ------------------------------------------------------------------------------
 extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c
 extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la

-libexec_PROGRAMS += extras/v4l_id/v4l_id
+pkglibexec_PROGRAMS += extras/v4l_id/v4l_id

 dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 
 # ------------------------------------------------------------------------------
 dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 
 # ------------------------------------------------------------------------------


@@ -354,7 +355,7 @@ dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 # ------------------------------------------------------------------------------
 extras_accelerometer_accelerometer_SOURCES = extras/accelerometer/accelerometer.c
 extras_accelerometer_accelerometer_LDADD = libudev/libudev-private.la -lm
 # ------------------------------------------------------------------------------
 extras_accelerometer_accelerometer_SOURCES = extras/accelerometer/accelerometer.c
 extras_accelerometer_accelerometer_LDADD = libudev/libudev-private.la -lm

-libexec_PROGRAMS += extras/accelerometer/accelerometer
+pkglibexec_PROGRAMS += extras/accelerometer/accelerometer

 dist_udevrules_DATA += extras/accelerometer/61-accelerometer.rules
 
 # ------------------------------------------------------------------------------
 dist_udevrules_DATA += extras/accelerometer/61-accelerometer.rules
 
 # ------------------------------------------------------------------------------


@@ -521,15 +522,15 @@ nodist_extras_keymap_keymap_SOURCES = \
        extras/keymap/keys-to-name.h
 BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES)
 
        extras/keymap/keys-to-name.h
 BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES)
 

-libexec_PROGRAMS += extras/keymap/keymap
+pkglibexec_PROGRAMS += extras/keymap/keymap

 dist_doc_DATA = extras/keymap/README.keymap.txt
 
 dist_udevrules_DATA += \
        extras/keymap/95-keymap.rules \
        extras/keymap/95-keyboard-force-release.rules
 
 dist_doc_DATA = extras/keymap/README.keymap.txt
 
 dist_udevrules_DATA += \
        extras/keymap/95-keymap.rules \
        extras/keymap/95-keyboard-force-release.rules
 

-dist_libexec_SCRIPTS += extras/keymap/findkeyboards
-libexec_SCRIPTS += extras/keymap/keyboard-force-release.sh
+dist_pkglibexec_SCRIPTS += extras/keymap/findkeyboards
+pkglibexec_SCRIPTS += extras/keymap/keyboard-force-release.sh

 
 EXTRA_DIST += \
        extras/keymap/check-keymaps.sh \
 
 EXTRA_DIST += \
        extras/keymap/check-keymaps.sh \


@@ -540,7 +541,7 @@ CLEANFILES += \
        extras/keymap/keys-from-name.gperf \
        extras/keymap/keyboard-force-release.sh
 
        extras/keymap/keys-from-name.gperf \
        extras/keymap/keyboard-force-release.sh
 

-udevkeymapdir = $(libexecdir)/keymaps
+udevkeymapdir = $(libexecdir)/udev/keymaps

 dist_udevkeymap_DATA = \
        extras/keymap/keymaps/acer \
        extras/keymap/keymaps/acer-aspire_5720 \
 dist_udevkeymap_DATA = \
        extras/keymap/keymaps/acer \
        extras/keymap/keymaps/acer-aspire_5720 \


@@ -599,7 +600,7 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/toshiba-satellite_m30x \
        extras/keymap/keymaps/zepto-znote
 
        extras/keymap/keymaps/toshiba-satellite_m30x \
        extras/keymap/keymaps/zepto-znote
 

-udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
+udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release

 dist_udevkeymapforcerel_DATA = \
        extras/keymap/force-release-maps/dell-touchpad \
        extras/keymap/force-release-maps/hp-other \
 dist_udevkeymapforcerel_DATA = \
        extras/keymap/force-release-maps/dell-touchpad \
        extras/keymap/force-release-maps/hp-other \


@@ -634,21 +635,19 @@ extras_mtd_probe_mtd_probe_SOURCES =  \
        extras/mtd_probe/probe_smartmedia.c
 extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
 dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
        extras/mtd_probe/probe_smartmedia.c
 extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
 dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules

-libexec_PROGRAMS += extras/mtd_probe/mtd_probe
+pkglibexec_PROGRAMS += extras/mtd_probe/mtd_probe

 endif
 
 if ENABLE_RULE_GENERATOR
 # ------------------------------------------------------------------------------
 # rule_generator - persistent network and optical device rule generator
 # ------------------------------------------------------------------------------
 endif
 
 if ENABLE_RULE_GENERATOR
 # ------------------------------------------------------------------------------
 # rule_generator - persistent network and optical device rule generator
 # ------------------------------------------------------------------------------

-dist_libexec_SCRIPTS += \
+dist_pkglibexec_SCRIPTS += \

        extras/rule_generator/write_cd_rules \
        extras/rule_generator/write_net_rules
 
        extras/rule_generator/write_cd_rules \
        extras/rule_generator/write_net_rules
 

-udevhomedir = $(libexecdir)
-dist_udevhome_DATA = extras/rule_generator/rule_generator.functions
-
-dist_udevrules_DATA += \
+pkglibexec_DATA = extras/rule_generator/rule_generator.functions
+dist_pkglibexec_DATA += \

        extras/rule_generator/75-cd-aliases-generator.rules \
        extras/rule_generator/75-persistent-net-generator.rules
 endif
        extras/rule_generator/75-cd-aliases-generator.rules \
        extras/rule_generator/75-persistent-net-generator.rules
 endif


@@ -661,11 +660,11 @@ extras_udev_acl_udev_acl_SOURCES = extras/udev-acl/udev-acl.c
 extras_udev_acl_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 extras_udev_acl_udev_acl_LDADD = libudev/libudev-private.la -lacl $(GLIB_LIBS)
 dist_udevrules_DATA += extras/udev-acl/70-udev-acl.rules
 extras_udev_acl_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 extras_udev_acl_udev_acl_LDADD = libudev/libudev-private.la -lacl $(GLIB_LIBS)
 dist_udevrules_DATA += extras/udev-acl/70-udev-acl.rules

-libexec_PROGRAMS += extras/udev-acl/udev-acl
+pkglibexec_PROGRAMS += extras/udev-acl/udev-acl

 
 udevacl-install-hook:
        mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
 
 udevacl-install-hook:
        mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d

-       ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
+       ln -sf $(libexecdir)/udev/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck

 
 INSTALL_EXEC_HOOKS += udevacl-install-hook
 endif
 
 INSTALL_EXEC_HOOKS += udevacl-install-hook
 endif


@@ -676,7 +675,7 @@ if ENABLE_FLOPPY
 # ------------------------------------------------------------------------------
 extras_floppy_create_floppy_devices_SOURCES = extras/floppy/create_floppy_devices.c
 extras_floppy_create_floppy_devices_LDADD = libudev/libudev-private.la
 # ------------------------------------------------------------------------------
 extras_floppy_create_floppy_devices_SOURCES = extras/floppy/create_floppy_devices.c
 extras_floppy_create_floppy_devices_LDADD = libudev/libudev-private.la

-libexec_PROGRAMS += extras/floppy/create_floppy_devices
+pkglibexec_PROGRAMS += extras/floppy/create_floppy_devices

 dist_udevrules_DATA += extras/floppy/60-floppy.rules
 endif
 
 dist_udevrules_DATA += extras/floppy/60-floppy.rules
 endif
 


@@ -686,7 +685,7 @@ if ENABLE_EDD
 # ------------------------------------------------------------------------------
 extras_edd_id_edd_id_SOURCES = extras/edd_id/edd_id.c
 extras_edd_id_edd_id_LDADD = libudev/libudev-private.la
 # ------------------------------------------------------------------------------
 extras_edd_id_edd_id_SOURCES = extras/edd_id/edd_id.c
 extras_edd_id_edd_id_LDADD = libudev/libudev-private.la

-libexec_PROGRAMS += extras/edd_id/edd_id
+pkglibexec_PROGRAMS += extras/edd_id/edd_id

 dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules
 endif
 
 dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules
 endif
 

diff --git a/NEWS b/NEWS
index f65ae0d7b097ae21a1915c130a37d66969466219..1210ed5a7321e4d2d2b9a60e4a4ec946734c4783 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,9 @@ The default install location of the 'udevadm' tool moved from 'sbin'
 to /usr/bin. Some tools expect udevadm in 'sbin'. A symlink to udevadm
 needs to be manually created if needed.
 
 to /usr/bin. Some tools expect udevadm in 'sbin'. A symlink to udevadm
 needs to be manually created if needed.
 

+The expected value of '--libexecdir' has changed and must no longer contain
+the 'udev' directory.
+

 Kernel modules are now loaded directly by linking udev to 'libkmod'. The
 'modprobe' tool is no longer executed by udev.
 
 Kernel modules are now loaded directly by linking udev to 'libkmod'. The
 'modprobe' tool is no longer executed by udev.
 

diff --git a/autogen.sh b/autogen.sh
index 683c498025b662bdad7fdbc92ce171ea73d5c9de..fdbff66c48b9e675cfe9ff646e22273be223c7c1 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,7 +16,7 @@ args="\
 --bindir=/sbin \
 --libdir=$(libdir /usr/lib) \
 --with-rootlibdir=$(libdir /lib) \
 --bindir=/sbin \
 --libdir=$(libdir /usr/lib) \
 --with-rootlibdir=$(libdir /lib) \

---libexecdir=/lib/udev \
+--libexecdir=/lib \

 --with-systemdsystemunitdir=/lib/systemd/system \
 --with-selinux \
 --enable-gtk-doc"
 --with-systemdsystemunitdir=/lib/systemd/system \
 --with-selinux \
 --enable-gtk-doc"

diff --git a/extras/keymap/keyboard-force-release.sh.in b/extras/keymap/keyboard-force-release.sh.in
index ce91a154b8d562ec9281e7390ce0643bacc06c85..154be3d73356b9670c86da922b25a3db8b7b9c09 100755 (executable)
--- a/extras/keymap/keyboard-force-release.sh.in
+++ b/extras/keymap/keyboard-force-release.sh.in
@@ -6,7 +6,7 @@
 
 case "$2" in
        /*) scf="$2" ;;
 
 case "$2" in
        /*) scf="$2" ;;

-       *)  scf="@libexecdir@/keymaps/force-release/$2" ;;
+       *)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;

 esac
 
 read attr <"/sys/$1/force_release"
 esac
 
 read attr <"/sys/$1/force_release"

diff --git a/extras/keymap/keymap.c b/extras/keymap/keymap.c
index fadd7a31d270043f3b793faf68afb80a05f1a961..79fd0599a928d482e3572bd978878a5c4aeacfb4 100644 (file)
--- a/extras/keymap/keymap.c
+++ b/extras/keymap/keymap.c
@@ -423,7 +423,7 @@ int main(int argc, char **argv)
                        if (f) {
                                merge_table(fd, f);
                        } else {
                        if (f) {
                                merge_table(fd, f);
                        } else {

-                               snprintf(keymap_path, sizeof(keymap_path), "%s%s", LIBEXECDIR "/keymaps/", filearg);
+                               snprintf(keymap_path, sizeof(keymap_path), "%s%s", PKGLIBEXECDIR "/keymaps/", filearg);

                                f = fopen(keymap_path, "r");
                                if (f)
                                        merge_table(fd, f);
                                f = fopen(keymap_path, "r");
                                if (f)
                                        merge_table(fd, f);

diff --git a/libudev/libudev.c b/libudev/libudev.c
index ca2ac5d03069fe0c4322faa3f7ba5ea6ea3a220f..f0f59e3a4dad229d9bde0719d392a6d0ca6627bc 100644 (file)
--- a/libudev/libudev.c
+++ b/libudev/libudev.c
@@ -256,7 +256,7 @@ UDEV_EXPORT struct udev *udev_new(void)
 
        if (udev->rules_path[0] == NULL) {
                /* /usr/lib/udev -- system rules */
 
        if (udev->rules_path[0] == NULL) {
                /* /usr/lib/udev -- system rules */

-               udev->rules_path[0] = strdup(LIBEXECDIR "/rules.d");
+               udev->rules_path[0] = strdup(PKGLIBEXECDIR "/rules.d");

                if (!udev->rules_path[0])
                        goto err;
 
                if (!udev->rules_path[0])
                        goto err;
 

diff --git a/systemd/udev.service.in b/systemd/udev.service.in
index 000721810bdb108b4eab98fe3cce1c340b161fa9..c27eb1baf5bf120a2a1cff19574f8fd1f2c668ff 100644 (file)
--- a/systemd/udev.service.in
+++ b/systemd/udev.service.in
@@ -11,4 +11,4 @@ Type=notify
 OOMScoreAdjust=-1000
 Sockets=udev-control.socket udev-kernel.socket
 Restart=on-failure
 OOMScoreAdjust=-1000
 Sockets=udev-control.socket udev-kernel.socket
 Restart=on-failure

-ExecStart=@libexecdir@/udevd
+ExecStart=@pkglibexecdir@/udevd

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 3801f23a6b43c52408222ec1aac6bef3931698e0..859d811bff8a58021423772cb0383c77c8ac6653 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -721,7 +721,7 @@ int udev_event_spawn(struct udev_event *event,
 
        /* allow programs in /usr/lib/udev/ to be called without the path */
        if (argv[0][0] != '/') {
 
        /* allow programs in /usr/lib/udev/ to be called without the path */
        if (argv[0][0] != '/') {

-               util_strscpyl(program, sizeof(program), LIBEXECDIR "/", argv[0], NULL);
+               util_strscpyl(program, sizeof(program), PKGLIBEXECDIR "/", argv[0], NULL);

                argv[0] = program;
        }
 
                argv[0] = program;
        }
 

diff --git a/udev/udev.pc.in b/udev/udev.pc.in
index 92a8b3ee173afe5168109a6a4763c2d530f1b167..0b04c02ef603725c60c50b80b544a542ad76d45b 100644 (file)
--- a/udev/udev.pc.in
+++ b/udev/udev.pc.in
@@ -2,4 +2,4 @@ Name: udev
 Description: udev
 Version: @VERSION@
 
 Description: udev
 Version: @VERSION@
 

-udevdir=@libexecdir@
+udevdir=@pkglibexecdir@

diff --git a/udev/udev.xml b/udev/udev.xml
index fca0dad7bff1956c8324e8dd75053ace61bb5d38..79213b4bbe29a3db2ccd454e7405b7b9b855eeeb 100644 (file)
--- a/udev/udev.xml
+++ b/udev/udev.xml
@@ -387,11 +387,9 @@
             this or a dependent device. Long running tasks need to be immediately
             detached from the event process itself.</para>
             <para>If no absolute path is given, the program is expected to live in
             this or a dependent device. Long running tasks need to be immediately
             detached from the event process itself.</para>
             <para>If no absolute path is given, the program is expected to live in

-            the directory provided at compile-time to configure via --libexecdir
-            (this is usually <filename>/usr/lib/udev</filename>), otherwise the absolute
-            path must be specified. The program name and following arguments are
-            separated by spaces. Single quotes can be used to specify arguments with
-            spaces.</para>
+            /usr/lib/udev, otherwise the absolute path must be specified. The program
+            name and following arguments are separated by spaces. Single quotes can
+            be used to specify arguments with spaces.</para>

           </listitem>
         </varlistentry>
 
           </listitem>
         </varlistentry>
 

diff --git a/udev/udevd.c b/udev/udevd.c
index 6b561977dc84a2f483e02c44e48fa107711a479f..196e63fd0d02483ee76b8d7a65085029f5d8699b 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -976,7 +976,7 @@ static void static_dev_create_from_devices(struct udev *udev, DIR *dir)
 {
        DIR *dir_from;
 
 {
        DIR *dir_from;
 

-       dir_from = opendir(LIBEXECDIR "/devices");
+       dir_from = opendir(PKGLIBEXECDIR "/devices");

        if (dir_from == NULL)
                return;
        copy_dev_dir(udev, dir_from, dir, 8);
        if (dir_from == NULL)
                return;
        copy_dev_dir(udev, dir_from, dir, 8);