diff -ur udev-118.orig/extras/ata_id/Makefile udev-118/extras/ata_id/Makefile
--- udev-118.orig/extras/ata_id/Makefile	2007-12-18 23:50:56.000000000 +0000
+++ udev-118/extras/ata_id/Makefile	2008-02-04 03:26:07.000000000 +0000
@@ -49,7 +49,8 @@
 .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 @@
 .PHONY: uninstall-bin
 
 install-man:
+	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
 	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
 .PHONY: install-man
 
--- udev-118.orig/extras/cdrom_id/Makefile	2007-12-18 23:50:56.000000000 +0000
+++ udev-118/extras/cdrom_id/Makefile	2008-02-04 03:27:22.000000000 +0000
@@ -49,8 +49,10 @@
 .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:
@@ -61,7 +61,8 @@
 .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 -ur udev-118.orig/extras/collect/Makefile udev-118/extras/collect/Makefile
--- udev-118.orig/extras/collect/Makefile	2007-12-18 23:50:56.000000000 +0000
+++ udev-118/extras/collect/Makefile	2008-02-04 03:28:07.000000000 +0000
@@ -44,7 +44,8 @@
 .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 -ur udev-118.orig/extras/edd_id/Makefile udev-118/extras/edd_id/Makefile
--- udev-118.orig/extras/edd_id/Makefile	2007-12-18 23:50:56.000000000 +0000
+++ udev-118/extras/edd_id/Makefile	2008-02-04 03:29:25.000000000 +0000
@@ -49,8 +49,10 @@
 .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 @@
 .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 -ur udev-118.orig/extras/firmware/Makefile udev-118/extras/firmware/Makefile
--- udev-118.orig/extras/firmware/Makefile	2007-12-18 23:50:56.000000000 +0000
+++ udev-118/extras/firmware/Makefile	2008-02-04 03:30:04.000000000 +0000
@@ -37,7 +37,8 @@
 .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 -ur udev-118.orig/extras/floppy/Makefile udev-118/extras/floppy/Makefile
--- udev-118.orig/extras/floppy/Makefile	2007-12-18 23:50:56.000000000 +0000
+++ udev-118/extras/floppy/Makefile	2008-02-04 03:31:04.000000000 +0000
@@ -49,7 +49,8 @@
 .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 @@
 .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 -ur udev-118.orig/extras/path_id/Makefile udev-118/extras/path_id/Makefile
--- udev-118.orig/extras/path_id/Makefile	2007-12-18 23:50:56.000000000 +0000
+++ udev-118/extras/path_id/Makefile	2008-02-04 03:32:02.000000000 +0000
@@ -37,7 +37,8 @@
 .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 @@
 .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 -ur udev-118.orig/extras/rule_generator/Makefile udev-118/extras/rule_generator/Makefile
--- udev-118.orig/extras/rule_generator/Makefile	2007-12-18 23:50:56.000000000 +0000
+++ udev-118/extras/rule_generator/Makefile	2008-02-04 03:33:29.000000000 +0000
@@ -37,12 +37,14 @@
 .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 -ur udev-118.orig/extras/scsi_id/Makefile udev-118/extras/scsi_id/Makefile
--- udev-118.orig/extras/scsi_id/Makefile	2007-12-18 23:50:56.000000000 +0000
+++ udev-118/extras/scsi_id/Makefile	2008-02-04 03:35:36.000000000 +0000
@@ -58,7 +58,8 @@
 .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 @@
 .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 @@
 
 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 -ur udev-118.orig/extras/usb_id/Makefile udev-118/extras/usb_id/Makefile
--- udev-118.orig/extras/usb_id/Makefile	2007-12-18 23:50:56.000000000 +0000
+++ udev-118/extras/usb_id/Makefile	2008-02-04 03:36:03.000000000 +0000
@@ -49,7 +49,8 @@
 .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 -ur udev-118.orig/extras/volume_id/lib/Makefile udev-118/extras/volume_id/lib/Makefile
--- udev-118.orig/extras/volume_id/lib/Makefile	2008-02-04 03:39:32.000000000 +0000
+++ udev-118/extras/volume_id/lib/Makefile	2008-02-04 03:38:39.000000000 +0000
@@ -101,16 +101,19 @@
 	$(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) -d $(DESTDIR)$(usrlibdir)/pkgconfig
-	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
+	$(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
 .PHONY: install
 
 uninstall:
diff -ur udev-118.orig/extras/volume_id/Makefile udev-118/extras/volume_id/Makefile
--- udev-118.orig/extras/volume_id/Makefile	2007-12-18 23:50:56.000000000 +0000
+++ udev-118/extras/volume_id/Makefile	2008-02-04 03:36:56.000000000 +0000
@@ -60,7 +60,8 @@
 .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 @@
 .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 -ur udev-118.orig/Makefile udev-118/Makefile
--- udev-118.orig/Makefile	2008-02-04 03:39:32.000000000 +0000
+++ udev-118/Makefile	2008-02-04 03:20:15.000000000 +0000
@@ -236,9 +236,11 @@
 .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 @@
 .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 -ur udev-118.orig/extras/cdrom_id/Makefile udev-118/extras/cdrom_id/Makefile
--- udev-118.orig/extras/cdrom_id/Makefile	2008-02-04 03:42:42.000000000 +0000
+++ udev-118/extras/cdrom_id/Makefile	2008-02-04 03:44:58.000000000 +0000