Makefile: remove exec_prefix and srcdir

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

diff --git a/Makefile b/Makefile
index 4968df42616b6cdffe8b416d4f8dfe0f7f4a9f8f..6cc51eea0ab7281246548b27fd1538b49b8fc2b3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 4080df1b42f4c7c39baa567f319f0b913593dddf..ebf0f4e9b43c05fc3be091d10e366bd1dce84fec 100644 (file)
--- 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 f1120673e1da9ee7effe6429fcb99cb9ffabadbe..985eb805a55e9189ad3840b451bd0bfd5bcde97c 100644 (file)
--- 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 a995c7892da11ec35ce364546ec6bef1272d1778..80680f22fea727e25627580508e69e49767c8381 100644 (file)
--- 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 469d6d4d0349344bc16cea8da0fc56b10fc9804e..5a6cdb65c360f0758f3c1e0e38a3131a0c3cf60f 100644 (file)
--- 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 48dacb47642e8696255b4bf9caf3f566159c9d58..78a7935d668eaaa3a3c467c90539918bb3d4c00f 100644 (file)
--- 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 344f48828d882a1d132dd6b7ccf02277e296f863..d894a4a3e1d51e99657e7041ab1153350120231e 100644 (file)
--- 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 1b48719c61798720442e4bc1772154d6910fdb58..7d5bccbcca085d1990e556e8db6c28bca7ad6553 100644 (file)
--- 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 fadd4a1dd40b932ace3ae259f13a17d3db58a858..399de76911370ebc0c2f85b084358ff687fff56f 100644 (file)
--- 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 9f82fd5b2ca8b6981e24c6153f5a5c1805e2cf9b..f6d26e1c4ce52af44e5e2a14376744839b18a341 100644 (file)
--- 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 30c0abb9a4e683462f999eb5d219602286ac4e6a..6201044941029982b39fec23f5b343f568fa3dc2 100644 (file)
--- 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}