diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | extras/ata_id/Makefile | 9 | ||||
| -rw-r--r-- | extras/cdrom_id/Makefile | 9 | ||||
| -rw-r--r-- | extras/dasd_id/Makefile | 9 | ||||
| -rw-r--r-- | extras/edd_id/Makefile | 9 | ||||
| -rw-r--r-- | extras/firmware/Makefile | 9 | ||||
| -rw-r--r-- | extras/floppy/Makefile | 9 | ||||
| -rw-r--r-- | extras/run_directory/Makefile | 9 | ||||
| -rw-r--r-- | extras/scsi_id/Makefile | 9 | ||||
| -rw-r--r-- | extras/usb_id/Makefile | 9 | ||||
| -rw-r--r-- | extras/volume_id/Makefile | 9 |
11 files changed, 44 insertions, 55 deletions
@@ -108,11 +108,11 @@ GEN_HEADERS = \ # override this to make udev look in a different location for it's config files prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev udevdir = /dev @@ -248,7 +248,6 @@ udev_version.h: @echo "Creating udev_version.h" @echo \#define UDEV_VERSION \"$(VERSION)\" > $@ @echo \#define UDEV_ROOT \"$(udevdir)\" >> $@ - @echo \#define UDEV_CONFIG_DIR \"$(configdir)\" >> $@ @echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@ @echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@ @echo \#define UDEVD_BIN \"$(sbindir)/udevd\" >> $@ diff --git a/extras/ata_id/Makefile b/extras/ata_id/Makefile index 4080df1b42..ebf0f4e9b4 100644 --- a/extras/ata_id/Makefile +++ b/extras/ata_id/Makefile @@ -12,14 +12,13 @@ GEN_HEADERS = MAN_PAGES = prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -srcdir = . INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile index f1120673e1..985eb805a5 100644 --- a/extras/cdrom_id/Makefile +++ b/extras/cdrom_id/Makefile @@ -12,14 +12,13 @@ GEN_HEADERS = MAN_PAGES = prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -srcdir = . INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} diff --git a/extras/dasd_id/Makefile b/extras/dasd_id/Makefile index a995c7892d..80680f22fe 100644 --- a/extras/dasd_id/Makefile +++ b/extras/dasd_id/Makefile @@ -12,14 +12,13 @@ GEN_HEADERS = MAN_PAGES = prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -srcdir = . INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} diff --git a/extras/edd_id/Makefile b/extras/edd_id/Makefile index 469d6d4d03..5a6cdb65c3 100644 --- a/extras/edd_id/Makefile +++ b/extras/edd_id/Makefile @@ -12,14 +12,13 @@ GEN_HEADERS = MAN_PAGES = prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -srcdir = . INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} diff --git a/extras/firmware/Makefile b/extras/firmware/Makefile index 48dacb4764..78a7935d66 100644 --- a/extras/firmware/Makefile +++ b/extras/firmware/Makefile @@ -12,14 +12,13 @@ GEN_HEADERS = MAN_PAGES = prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -srcdir = . INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} diff --git a/extras/floppy/Makefile b/extras/floppy/Makefile index 344f48828d..d894a4a3e1 100644 --- a/extras/floppy/Makefile +++ b/extras/floppy/Makefile @@ -12,14 +12,13 @@ GEN_HEADERS = MAN_PAGES = prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -srcdir = . INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} diff --git a/extras/run_directory/Makefile b/extras/run_directory/Makefile index 1b48719c61..7d5bccbcca 100644 --- a/extras/run_directory/Makefile +++ b/extras/run_directory/Makefile @@ -11,14 +11,13 @@ GEN_HEADERS = MAN_PAGES = prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -srcdir = . INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile index fadd4a1dd4..399de76911 100644 --- a/extras/scsi_id/Makefile +++ b/extras/scsi_id/Makefile @@ -15,14 +15,13 @@ GEN_HEADERS = scsi_id_version.h MAN_PAGES = scsi_id.8 prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -srcdir = . INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} diff --git a/extras/usb_id/Makefile b/extras/usb_id/Makefile index 9f82fd5b2c..f6d26e1c4c 100644 --- a/extras/usb_id/Makefile +++ b/extras/usb_id/Makefile @@ -12,14 +12,13 @@ GEN_HEADERS = MAN_PAGES = prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -srcdir = . INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile index 30c0abb9a4..6201044941 100644 --- a/extras/volume_id/Makefile +++ b/extras/volume_id/Makefile @@ -11,14 +11,13 @@ GEN_HEADERS = MAN_PAGES = prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -srcdir = . INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} |