diff --git a/Makefile b/Makefile index 0ef15df202..536467edf3 100644 --- a/Makefile +++ b/Makefile @@ -101,10 +101,10 @@ configdir = ${etcdir}/udev udevdir = /dev DESTDIR = -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} PWD = $(shell pwd) CROSS_COMPILE ?= diff --git a/extras/ata_id/Makefile b/extras/ata_id/Makefile index c55bdac7c4..c9691da1e2 100644 --- a/extras/ata_id/Makefile +++ b/extras/ata_id/Makefile @@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile index d5138c5933..7cd7c1d74a 100644 --- a/extras/cdrom_id/Makefile +++ b/extras/cdrom_id/Makefile @@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all diff --git a/extras/dasd_id/Makefile b/extras/dasd_id/Makefile index 627b6cf42f..493c80ef8d 100644 --- a/extras/dasd_id/Makefile +++ b/extras/dasd_id/Makefile @@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all diff --git a/extras/edd_id/Makefile b/extras/edd_id/Makefile index 01c2657e20..71cc3dad7c 100644 --- a/extras/edd_id/Makefile +++ b/extras/edd_id/Makefile @@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all diff --git a/extras/firmware/Makefile b/extras/firmware/Makefile index cfc7cd5153..c187b47635 100644 --- a/extras/firmware/Makefile +++ b/extras/firmware/Makefile @@ -17,10 +17,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all @@ -37,7 +37,7 @@ clean: .PHONY: clean install-bin: all - $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG) + $(INSTALL_SCRIPT) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG) .PHONY: install-bin uninstall-bin: diff --git a/extras/floppy/Makefile b/extras/floppy/Makefile index 4416559c4a..2044ac56fd 100644 --- a/extras/floppy/Makefile +++ b/extras/floppy/Makefile @@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all diff --git a/extras/path_id/Makefile b/extras/path_id/Makefile index 7884a5ef5a..2f6890cb32 100644 --- a/extras/path_id/Makefile +++ b/extras/path_id/Makefile @@ -17,10 +17,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all @@ -37,7 +37,7 @@ clean: .PHONY: clean install-bin: all - $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG) + $(INSTALL_SCRIPT) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG) .PHONY: install-bin uninstall-bin: diff --git a/extras/rule_generator/Makefile b/extras/rule_generator/Makefile index 810be24d2b..f023848b0b 100644 --- a/extras/rule_generator/Makefile +++ b/extras/rule_generator/Makefile @@ -17,10 +17,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all @@ -37,9 +37,9 @@ clean: .PHONY: clean install-bin: all - $(INSTALL_PROGRAM) -D rule_generator.functions $(DESTDIR)$(libudevdir)/rule_generator.functions - $(INSTALL_PROGRAM) -D write_cd_rules $(DESTDIR)$(libudevdir)/write_cd_rules - $(INSTALL_PROGRAM) -D write_net_rules $(DESTDIR)$(libudevdir)/write_net_rules + $(INSTALL_SCRIPT) -D rule_generator.functions $(DESTDIR)$(libudevdir)/rule_generator.functions + $(INSTALL_SCRIPT) -D write_cd_rules $(DESTDIR)$(libudevdir)/write_cd_rules + $(INSTALL_SCRIPT) -D write_net_rules $(DESTDIR)$(libudevdir)/write_net_rules $(INSTALL_DATA) -D 75-cd-aliases-generator.rules \ $(DESTDIR)$(configdir)/rules.d/75-cd-aliases-generator.rules $(INSTALL_DATA) -D 75-persistent-net-generator.rules \ diff --git a/extras/run_directory/Makefile b/extras/run_directory/Makefile index 6a4e4df5ca..7a72e83dae 100644 --- a/extras/run_directory/Makefile +++ b/extras/run_directory/Makefile @@ -19,10 +19,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile index 8ebe7026bb..32b2eaeecf 100644 --- a/extras/scsi_id/Makefile +++ b/extras/scsi_id/Makefile @@ -23,10 +23,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all diff --git a/extras/usb_id/Makefile b/extras/usb_id/Makefile index d045a64857..7787161b63 100644 --- a/extras/usb_id/Makefile +++ b/extras/usb_id/Makefile @@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile index a0401b04e8..80f9755d19 100644 --- a/extras/volume_id/Makefile +++ b/extras/volume_id/Makefile @@ -18,10 +18,10 @@ libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev/ -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} all: $(PROG) $(MAN_PAGES) .PHONY: all diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile index 1bf7de4aeb..a3e947ceac 100644 --- a/extras/volume_id/lib/Makefile +++ b/extras/volume_id/lib/Makefile @@ -8,7 +8,7 @@ includedir = ${prefix}/usr/include libdir = ${prefix}/lib usrlibdir = ${prefix}/usr/lib -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_LIB = ${INSTALL} -m 755