EXTRAS/Makefile: fix install targets to match main Makefile

11 files changed, 38 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index 95b657c47c..7e3adb975b 100644
--- a/Makefile
+++ b/Makefile
@@ -333,6 +333,10 @@ install-config: $(GEN_CONFIGS)
 		echo "pick a udev rules file from the etc/udev directory that matches your distribution"; \
 		echo; \
 	fi
+	@extras="$(EXTRAS)"; for target in $$extras; do \
+		echo $$target; \
+		$(MAKE) prefix=$(prefix) -C $$target $@; \
+	done;
 .PHONY: install-config
 
 install-man:
@@ -344,6 +348,10 @@ install-man:
 	$(INSTALL_DATA) -D udevsend.8 $(DESTDIR)$(mandir)/man8/udevsend.8
 	$(INSTALL_DATA) -D udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8
 	- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
+	@extras="$(EXTRAS)"; for target in $$extras; do \
+		echo $$target; \
+		$(MAKE) prefix=$(prefix) -C $$target $@; \
+	done;
 .PHONY: install-man
 
 uninstall-man:
@@ -355,6 +363,10 @@ uninstall-man:
 	- rm $(mandir)/man8/udevmonitor.8
 	- rm $(mandir)/man8/udevsend.8
 	- rm $(mandir)/man8/udevcontrol.8
+	@extras="$(EXTRAS)"; for target in $$extras; do \
+		echo $$target; \
+		$(MAKE) prefix=$(prefix) -C $$target $@; \
+	done;
 .PHONY: uninstall-man
 
 install-bin:
diff --git a/extras/ata_id/Makefile b/extras/ata_id/Makefile
index eab01ad9ab..769b7e3c2d 100644
--- a/extras/ata_id/Makefile
+++ b/extras/ata_id/Makefile
@@ -43,8 +43,8 @@ clean:
 
 spotless: clean
 
-install: all
+install-bin: all
 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
 	- rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile
index 6ea5f14ec1..c6dfc4e1a8 100644
--- a/extras/cdrom_id/Makefile
+++ b/extras/cdrom_id/Makefile
@@ -44,8 +44,8 @@ clean:
 
 spotless: clean
 
-install: all
+install-bin: all
 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
 	- rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/dasd_id/Makefile b/extras/dasd_id/Makefile
index f2c0595de0..23331ce14c 100644
--- a/extras/dasd_id/Makefile
+++ b/extras/dasd_id/Makefile
@@ -43,8 +43,8 @@ clean:
 
 spotless: clean
 
-install: all
+install-bin: all
 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
 	- rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/edd_id/Makefile b/extras/edd_id/Makefile
index 627884a329..aa3db4f209 100644
--- a/extras/edd_id/Makefile
+++ b/extras/edd_id/Makefile
@@ -43,8 +43,8 @@ clean:
 
 spotless: clean
 
-install: all
+install-bin: all
 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
 	- rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/firmware/Makefile b/extras/firmware/Makefile
index 343d5295f1..5632e0dee5 100644
--- a/extras/firmware/Makefile
+++ b/extras/firmware/Makefile
@@ -44,8 +44,8 @@ clean:
 
 spotless: clean
 
-install: all
+install-bin: all
 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
 	- rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/floppy/Makefile b/extras/floppy/Makefile
index 5380590c9b..b7915fc484 100644
--- a/extras/floppy/Makefile
+++ b/extras/floppy/Makefile
@@ -43,8 +43,8 @@ clean:
 
 spotless: clean
 
-install: all
+install-bin: all
 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
 	- rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/run_directory/Makefile b/extras/run_directory/Makefile
index c1a83e3c0b..38ef7b128e 100644
--- a/extras/run_directory/Makefile
+++ b/extras/run_directory/Makefile
@@ -45,9 +45,9 @@ clean:
 
 spotless: clean
 
-install: all
+install-bin: all
 	$(INSTALL_PROGRAM) $(DEVD) $(DESTDIR)$(sbindir)/$(DEVD)
 	$(INSTALL_PROGRAM) $(HOTPLUGD) $(DESTDIR)$(sbindir)/$(HOTPLUGD)
 
-uninstall:
+uninstall-bin:
 	- rm $(DESTDIR)$(sbindir)/$(DEVD)
diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index 3c38d6171e..3b75e165fb 100644
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -46,18 +46,23 @@ all:	$(PROG)
 
 # XXX use a compressed man page?
 
-install: all
+install-bin: all
 	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+
+install-man:
 	$(INSTALL_DATA) -D scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8
+
+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; \
 	fi
 	
-uninstall:
+uninstall-bin:
 	-rm $(DESTDIR)$(sbindir)/$(PROG)
+
+uninstall-man:
 	-rm $(DESTDIR)$(mandir)/man8/scsi_id.8
-	-rm $(DESTDIR)$(etcdir)/scsi_id.config
 
 GEN_HEADER=scsi_id_version.h
 
diff --git a/extras/usb_id/Makefile b/extras/usb_id/Makefile
index 4347fba407..10dd09da21 100644
--- a/extras/usb_id/Makefile
+++ b/extras/usb_id/Makefile
@@ -44,8 +44,8 @@ clean:
 
 spotless: clean
 
-install: all
+install-bin: all
 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
 	- rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 8ca3bd1333..c1dd74f0f7 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -47,8 +47,8 @@ clean:
 
 spotless: clean
 
-install: all
+install-bin: all
 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
 	- rm $(DESTDIR)$(sbindir)/$(PROG)