From 1ac216b198e559163b1c81eca2f1c9a635d8e326 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
Date: Wed, 14 Sep 2005 14:27:28 +0200
Subject: [PATCH] EXTRAS/Makefile: fix install targets to match main Makefile

---
 Makefile                      | 12 ++++++++++++
 extras/ata_id/Makefile        |  4 ++--
 extras/cdrom_id/Makefile      |  4 ++--
 extras/dasd_id/Makefile       |  4 ++--
 extras/edd_id/Makefile        |  4 ++--
 extras/firmware/Makefile      |  4 ++--
 extras/floppy/Makefile        |  4 ++--
 extras/run_directory/Makefile |  4 ++--
 extras/scsi_id/Makefile       | 11 ++++++++---
 extras/usb_id/Makefile        |  4 ++--
 extras/volume_id/Makefile     |  4 ++--
 11 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 95b657c47..7e3adb975 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 eab01ad9a..769b7e3c2 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 6ea5f14ec..c6dfc4e1a 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 f2c0595de..23331ce14 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 627884a32..aa3db4f20 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 343d5295f..5632e0dee 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 5380590c9..b7915fc48 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 c1a83e3c0..38ef7b128 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 3c38d6171..3b75e165f 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 4347fba40..10dd09da2 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 8ca3bd133..c1dd74f0f 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)
-- 
2.30.2