fix INSTALL_PROGRAM vs. INSTALL_SCRIPT

diff --git a/Makefile b/Makefile
index 0ef15df2020d79c565d0d05dd40dd2fa45049b07..536467edf3d784be80edb8e156ff447a1a770959 100644 (file)
--- 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 c55bdac7c485b24da7c242909f83ebb9d90a9196..c9691da1e24bea6bb51130fac987fe2a1fd94a94 100644 (file)
--- 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 d5138c59338e34b5b8ee3673dca90839b968682e..7cd7c1d74ae235d29aa4df16a58e264063c3a6fe 100644 (file)
--- 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 627b6cf42f6aeeac6f63ce025d92c8a924ae21a4..493c80ef8dc74a4ec9ff38d3e2626fd9b307f706 100644 (file)
--- 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 01c2657e20a5e6adf04512ac3d4dedf204615508..71cc3dad7c060faec5ce0aa917ce3dcb29dafc5d 100644 (file)
--- 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 cfc7cd51537feecae212016cbfe2f694ae8cc3f4..c187b47635fde89473513c47b5873b8e7269d198 100644 (file)
--- 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 4416559c4a50a818e6a62baab1df9c409c0db1b8..2044ac56fdd92bc6c4dff5b0a002169b03ad60a0 100644 (file)
--- 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 7884a5ef5afec31f2e40b9443c547bc204edc29a..2f6890cb32469e84ef200bc54a238b5a48a3f87e 100644 (file)
--- 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 810be24d2be4ddfaedb5913b87ec73995fa48ef0..f023848b0bcedeea9f837c8875edbf7b54977eac 100644 (file)
--- 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 6a4e4df5ca41be4b4bcd42a5b755a1fb5a4ff417..7a72e83dae87feb3804f8e896b013e0fba84776a 100644 (file)
--- 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 8ebe7026bbb38f6d47fb1be13aabc182d3deff71..32b2eaeecfb065f96676c3bda71dc81d24a73f2b 100644 (file)
--- 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 d045a64857994237ca9232acbaa88ab937362239..7787161b6369fdc6fd45b7127ae2ef98f71c1ae4 100644 (file)
--- 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 a0401b04e8b9537485bae9866b5b1c3464621edc..80f9755d19bb9ee3f4303a4e6744d42476fea079 100644 (file)
--- 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 1bf7de4aebdbbd455723977b225ecfe9eb89e04c..a3e947ceac3be7a26418ac905bf6d549b00b16e4 100644 (file)
--- 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