diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-06-17 02:25:07 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2009-06-17 02:25:07 +0200 |
| commit | 6133f3432fe86bc140cc9ba74794826f75c915fa (patch) | |
| tree | 1199e3d6f005b66ea7b0d8b34d5ef323d7ee3cc0 /udev | |
| parent | 29cf5b58be1a783157edc37d7151d86acbdd5732 (diff) | |
cleanup ./configure installation directory options
Diffstat (limited to 'udev')
| -rw-r--r-- | udev/udev-rules.c | 4 | ||||
| -rw-r--r-- | udev/udev.h | 2 | ||||
| -rw-r--r-- | udev/udevd.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/udev/udev-rules.c b/udev/udev-rules.c index 7db890fed9..174edfd9c4 100644 --- a/udev/udev-rules.c +++ b/udev/udev-rules.c @@ -1338,7 +1338,7 @@ static int add_rule(struct udev_rules *rules, char *line, /* allow programs in /lib/udev called without the path */ if (value[0] != '/') - util_strscpyl(file, sizeof(file), UDEV_PREFIX "/lib/udev/", value, NULL); + util_strscpyl(file, sizeof(file), LIBEXECDIR "/", value, NULL); else util_strscpy(file, sizeof(file), value); pos = strchr(file, ' '); @@ -1734,7 +1734,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) add_matching_files(udev, &sort_list, filename, ".rules"); /* read default rules */ - add_matching_files(udev, &sort_list, UDEV_PREFIX "/lib/udev/rules.d", ".rules"); + add_matching_files(udev, &sort_list, LIBEXECDIR "/rules.d", ".rules"); /* sort all rules files by basename into list of files */ udev_list_entry_foreach_safe(sort_loop, sort_tmp, udev_list_get_entry(&sort_list)) { diff --git a/udev/udev.h b/udev/udev.h index 3e3ecfb1fe..391276f6e4 100644 --- a/udev/udev.h +++ b/udev/udev.h @@ -28,7 +28,7 @@ #define DEFAULT_FAKE_PARTITIONS_COUNT 15 #define UDEV_EVENT_TIMEOUT 180 -#define UDEV_CTRL_SOCK_PATH "@" UDEV_PREFIX "/org/kernel/udev/udevd" +#define UDEV_CTRL_SOCK_PATH "@/org/kernel/udev/udevd" struct udev_event { struct udev *udev; diff --git a/udev/udevd.c b/udev/udevd.c index 292f4374d7..b2e4a022c5 100644 --- a/udev/udevd.c +++ b/udev/udevd.c @@ -869,7 +869,7 @@ int main(int argc, char *argv[]) } else { char filename[UTIL_PATH_SIZE]; - inotify_add_watch(pfd[FD_INOTIFY].fd, UDEV_PREFIX "/lib/udev/rules.d", + inotify_add_watch(pfd[FD_INOTIFY].fd, LIBEXECDIR "/rules.d", IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); inotify_add_watch(pfd[FD_INOTIFY].fd, SYSCONFDIR "/udev/rules.d", IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); |