diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2012-01-05 19:13:41 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2012-01-05 19:13:41 +0100 |
| commit | 1495719024cae87fd42167ec77691ebb64ba20d7 (patch) | |
| tree | 2fe2069e9884e36a323957c68e1a8064447b1511 /udev | |
| parent | 16ab1f22fc8aba4b526761df6246263d4df32343 (diff) | |
build-sys: use --libexecdir=/usr/lib instead of /usr/lib/udev
Diffstat (limited to 'udev')
| -rw-r--r-- | udev/udev-event.c | 2 | ||||
| -rw-r--r-- | udev/udev.pc.in | 2 | ||||
| -rw-r--r-- | udev/udev.xml | 8 | ||||
| -rw-r--r-- | udev/udevd.c | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/udev/udev-event.c b/udev/udev-event.c index 3801f23a6b..859d811bff 100644 --- 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] != '/') { - util_strscpyl(program, sizeof(program), LIBEXECDIR "/", argv[0], NULL); + util_strscpyl(program, sizeof(program), PKGLIBEXECDIR "/", argv[0], NULL); argv[0] = program; } diff --git a/udev/udev.pc.in b/udev/udev.pc.in index 92a8b3ee17..0b04c02ef6 100644 --- a/udev/udev.pc.in +++ b/udev/udev.pc.in @@ -2,4 +2,4 @@ Name: udev Description: udev Version: @VERSION@ -udevdir=@libexecdir@ +udevdir=@pkglibexecdir@ diff --git a/udev/udev.xml b/udev/udev.xml index fca0dad7bf..79213b4bbe 100644 --- 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 - 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> diff --git a/udev/udevd.c b/udev/udevd.c index 6b561977dc..196e63fd0d 100644 --- 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_from = opendir(LIBEXECDIR "/devices"); + dir_from = opendir(PKGLIBEXECDIR "/devices"); if (dir_from == NULL) return; copy_dev_dir(udev, dir_from, dir, 8); |