Makefile: do not require GNU install

diff --git a/Makefile b/Makefile
index 6c7f139e2c6d37f8a7e3429486fa3d27ebfcf2d4..2fcc4247fad03e5ddce2f7b40242e2c13608c68e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -236,9 +236,11 @@ install-config:
 .PHONY: install-config
 
 install-man:
-       $(INSTALL_DATA) -D udev.7 $(DESTDIR)$(mandir)/man7/udev.7
-       $(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
-       $(INSTALL_DATA) -D udevadm.8 $(DESTDIR)$(mandir)/man8/udevadm.8
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man7
+       $(INSTALL_DATA) udev.7 $(DESTDIR)$(mandir)/man7/udev.7
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man8
+       $(INSTALL_DATA) udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
+       $(INSTALL_DATA) udevadm.8 $(DESTDIR)$(mandir)/man8/udevadm.8
        ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
        ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevtest.8
        ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8
@@ -266,13 +268,13 @@ uninstall-man:
 .PHONY: uninstall-man
 
 install-bin:
-       $(INSTALL) -d $(DESTDIR)$(udevdir)
-       $(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd
-       $(INSTALL_PROGRAM) -D udevadm $(DESTDIR)$(sbindir)/udevadm
+       $(INSTALL) -d $(DESTDIR)$(sbindir)
+       $(INSTALL_PROGRAM) udevd $(DESTDIR)$(sbindir)/udevd
+       $(INSTALL_PROGRAM) udevadm $(DESTDIR)$(sbindir)/udevadm
        ln -f -s udevadm $(DESTDIR)$(sbindir)/udevtrigger
        ln -f -s udevadm $(DESTDIR)$(sbindir)/udevsettle
        ln -f -s udevadm $(DESTDIR)$(sbindir)/udevcontrol
-       mkdir -p -m 0755 $(DESTDIR)$(usrsbindir)
+       $(INSTALL) -d $(DESTDIR)$(usrsbindir)
        ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrsbindir)/udevmonitor
        mkdir -p -m 0755 $(DESTDIR)$(usrbindir)
        ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrbindir)/udevinfo

diff --git a/extras/ata_id/Makefile b/extras/ata_id/Makefile
index c9691da1e24bea6bb51130fac987fe2a1fd94a94..bab49a250d8d853d7a905c8bbec1ca5e4de33905 100644 (file)
--- a/extras/ata_id/Makefile
+++ b/extras/ata_id/Makefile
@@ -49,7 +49,8 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:
@@ -57,6 +58,7 @@ uninstall-bin:
 .PHONY: uninstall-bin
 
 install-man:
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man8
        $(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
 .PHONY: install-man
 

diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile
index 7cd7c1d74ae235d29aa4df16a58e264063c3a6fe..caab2beaf5451be43180a182f1eedd5fcb786f58 100644 (file)
--- a/extras/cdrom_id/Makefile
+++ b/extras/cdrom_id/Makefile
@@ -49,8 +49,10 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-       $(INSTALL_DATA) -D 60-cdrom_id.rules $(DESTDIR)$(configdir)/rules.d/60-cdrom_id.rules
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+       $(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
+       $(INSTALL_DATA) 60-cdrom_id.rules $(DESTDIR)$(configdir)/rules.d/60-cdrom_id.rules
 .PHONY: install-bin
 
 uninstall-bin:
@@ -59,7 +61,8 @@ uninstall-bin:
 .PHONY: uninstall-bin
 
 install-man:
-       $(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man8
+       $(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
 .PHONY: install-man
 
 uninstall-man:

diff --git a/extras/collect/Makefile b/extras/collect/Makefile
index 6168a8b8054b1512cea668d8cfc13b2cc0e3c4a7..76487017ddfccdffa8e7b03ff8ebfa529adbdc9e 100644 (file)
--- a/extras/collect/Makefile
+++ b/extras/collect/Makefile
@@ -44,7 +44,8 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:

diff --git a/extras/edd_id/Makefile b/extras/edd_id/Makefile
index f52c3bc3f09a3f4ba0a2a22d9822d83f652792d4..f17a5b8c6536226f08d744bda9e1cd3b327227f2 100644 (file)
--- a/extras/edd_id/Makefile
+++ b/extras/edd_id/Makefile
@@ -49,8 +49,10 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-       $(INSTALL_DATA) -D 61-persistent-storage-edd.rules $(DESTDIR)$(configdir)/rules.d/61-persistent-storage-edd.rules
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+       $(INSTALL) -d $(DESTDIR)$(configdir)/rules.d/
+       $(INSTALL_DATA) 61-persistent-storage-edd.rules $(DESTDIR)$(configdir)/rules.d/61-persistent-storage-edd.rules
 .PHONY: install-bin
 
 uninstall-bin:
@@ -59,7 +61,8 @@ uninstall-bin:
 .PHONY: uninstall-bin
 
 install-man:
-       $(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man8
+       $(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
 .PHONY: install-man
 
 uninstall-man:

diff --git a/extras/firmware/Makefile b/extras/firmware/Makefile
index c187b47635fde89473513c47b5873b8e7269d198..5e84acb15634a6a5fa3bcde80cb680097b5f65f8 100644 (file)
--- a/extras/firmware/Makefile
+++ b/extras/firmware/Makefile
@@ -37,7 +37,8 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_SCRIPT) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:

diff --git a/extras/floppy/Makefile b/extras/floppy/Makefile
index 784464a84339b26f3d8a500a6b060d5a494e4909..0adc373c9410fc57d450ea7acf0988177f839d2b 100644 (file)
--- a/extras/floppy/Makefile
+++ b/extras/floppy/Makefile
@@ -49,7 +49,8 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:
@@ -57,7 +58,8 @@ uninstall-bin:
 .PHONY: uninstall-bin
 
 install-man:
-       $(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man8/
+       $(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
 .PHONY: install-man
 
 uninstall-man:

diff --git a/extras/path_id/Makefile b/extras/path_id/Makefile
index d8efe64187231d84159258b2e4d0143049679ed7..2f0b882e655f160c3025ff32a7b3b341e311b676 100644 (file)
--- a/extras/path_id/Makefile
+++ b/extras/path_id/Makefile
@@ -37,7 +37,8 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_SCRIPT) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:
@@ -45,7 +46,8 @@ uninstall-bin:
 .PHONY: uninstall-bin
 
 install-man:
-       $(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man8/
+       $(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
 .PHONY: install-man
 
 uninstall-man:

diff --git a/extras/rule_generator/Makefile b/extras/rule_generator/Makefile
index cc6fe056c618e3ff0dbe346b0e53c37ca8b7a634..d6f1265eb97116b832c2a995ed7b6a1624040808 100644 (file)
--- a/extras/rule_generator/Makefile
+++ b/extras/rule_generator/Makefile
@@ -37,12 +37,14 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_DATA) -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 \
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_DATA) rule_generator.functions $(DESTDIR)$(libudevdir)/rule_generator.functions
+       $(INSTALL_SCRIPT) write_cd_rules $(DESTDIR)$(libudevdir)/write_cd_rules
+       $(INSTALL_SCRIPT) write_net_rules $(DESTDIR)$(libudevdir)/write_net_rules
+       $(INSTALL) -d  $(DESTDIR)$(configdir)/rules.d
+       $(INSTALL_DATA) 75-cd-aliases-generator.rules \
                $(DESTDIR)$(configdir)/rules.d/75-cd-aliases-generator.rules
-       $(INSTALL_DATA) -D 75-persistent-net-generator.rules \
+       $(INSTALL_DATA) 75-persistent-net-generator.rules \
                $(DESTDIR)$(configdir)/rules.d/75-persistent-net-generator.rules
 .PHONY: install-bin
 

diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index 349eeef1de255c10da0cd894cddc39e0f4780fdd..870296a6667ac5de7046876f97573dc69fcfd1f4 100644 (file)
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -58,7 +58,8 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:
@@ -66,7 +67,8 @@ uninstall-bin:
 .PHONY: uninstall-bin
 
 install-man:
-       $(INSTALL_DATA) -D scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man8
+       $(INSTALL_DATA) scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8
 .PHONY: install-man
 
 uninstall-man:
@@ -75,8 +77,10 @@ uninstall-man:
 
 install-config:
        @ if [ ! -r $(DESTDIR)$(etcdir)/scsi_id.config ]; then \
-               echo $(INSTALL_DATA) -D ./scsi_id.config  $(DESTDIR)$(etcdir); \
-               $(INSTALL_DATA) -D ./scsi_id.config $(DESTDIR)$(etcdir)/scsi_id.config; \
+               echo $(INSTALL) -d $(DESTDIR)$(etcdir); \
+               echo $(INSTALL_DATA) ./scsi_id.config  $(DESTDIR)$(etcdir); \
+               $(INSTALL) -d $(DESTDIR)$(etcdir); \
+               $(INSTALL_DATA) ./scsi_id.config $(DESTDIR)$(etcdir)/scsi_id.config; \
        fi
 .PHONY: install-config
 

diff --git a/extras/usb_id/Makefile b/extras/usb_id/Makefile
index 7787161b6369fdc6fd45b7127ae2ef98f71c1ae4..09496049a5c6dea26eda42a259e46da1883d313c 100644 (file)
--- a/extras/usb_id/Makefile
+++ b/extras/usb_id/Makefile
@@ -49,7 +49,8 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 6e5006594a1bf104275ad959bae8a4f0c5e4a27c..50d5e338c2cc36e23b6093f306bd450a62fc90e7 100644 (file)
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -60,7 +60,8 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
        $(MAKE) -C lib install
 .PHONY: install-bin
 
@@ -70,7 +71,8 @@ uninstall-bin:
 .PHONY: uninstall-bin
 
 install-man:
-       $(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man8
+       $(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
 .PHONY: install-man
 
 uninstall-man:

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index 105549a946eedc3ffbdfb275832a6da86177d860..c0905f4a06fc7844b22f6cb62c6884554ed958d0 100644 (file)
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -103,16 +103,19 @@ libvolume_id.pc:
        $(Q) echo "Cflags: -I\$${includedir}" >> $@
 
 install: all
-       $(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
-       $(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
-       mkdir -p $(DESTDIR)$(usrlibdir)/
+       $(INSTALL) -d $(DESTDIR)$(includedir)
+       $(INSTALL_DATA) libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
+       $(INSTALL) -d $(DESTDIR)$(libdir)
+       $(INSTALL_LIB) $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
+       $(INSTALL) -d $(DESTDIR)$(usrlibdir)
        ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
 ifeq ($(libdir),$(usrlibdir))
        ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
 else
        ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
 endif
-       $(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
+       $(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig
+       $(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
 .PHONY: install
 
 uninstall: