chiark / gitweb /
EXTRAS/Makefile: fix install targets to match main Makefile
authorJürg Billeter <j@bitron.ch>
Wed, 14 Sep 2005 12:27:28 +0000 (14:27 +0200)
committerKay Sievers <kay.sievers@suse.de>
Wed, 14 Sep 2005 12:27:28 +0000 (14:27 +0200)
Makefile
extras/ata_id/Makefile
extras/cdrom_id/Makefile
extras/dasd_id/Makefile
extras/edd_id/Makefile
extras/firmware/Makefile
extras/floppy/Makefile
extras/run_directory/Makefile
extras/scsi_id/Makefile
extras/usb_id/Makefile
extras/volume_id/Makefile

index 95b657c..7e3adb9 100644 (file)
--- 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:
index eab01ad..769b7e3 100644 (file)
@@ -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)
index 6ea5f14..c6dfc4e 100644 (file)
@@ -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)
index f2c0595..23331ce 100644 (file)
@@ -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)
index 627884a..aa3db4f 100644 (file)
@@ -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)
index 343d529..5632e0d 100644 (file)
@@ -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)
index 5380590..b7915fc 100644 (file)
@@ -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)
index c1a83e3..38ef7b1 100644 (file)
@@ -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)
index 3c38d61..3b75e16 100644 (file)
@@ -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
 
index 4347fba..10dd09d 100644 (file)
@@ -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)
index 8ca3bd1..c1dd74f 100644 (file)
@@ -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)