chiark / gitweb /
~ianmdlvl / elogind.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8c65c6a)
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 patch | blob | history
extras/ata_id/Makefile patch | blob | history
extras/cdrom_id/Makefile patch | blob | history
extras/dasd_id/Makefile patch | blob | history
extras/edd_id/Makefile patch | blob | history
extras/firmware/Makefile patch | blob | history
extras/floppy/Makefile patch | blob | history
extras/run_directory/Makefile patch | blob | history
extras/scsi_id/Makefile patch | blob | history
extras/usb_id/Makefile patch | blob | history
extras/volume_id/Makefile patch | blob | history

diff --git a/Makefile b/Makefile
index 95b657c47ca8e3906fb3f12ec840c4c7f0a0f9d0..7e3adb975b0a803b9908e865c40aef8d6e710b75 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
                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:
 .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
        $(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:
 .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
        - 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:
 .PHONY: uninstall-man
 
 install-bin:
diff --git a/extras/ata_id/Makefile b/extras/ata_id/Makefile
index eab01ad9ab8fde4e7a6e5eaf7f6f2bcb610a5125..769b7e3c2d7ca119745f20d6d85ab8dca98aa909 100644 (file)
--- a/extras/ata_id/Makefile
+++ b/extras/ata_id/Makefile
@@ -43,8 +43,8 @@ clean:
 
 spotless: clean
 
 
 spotless: clean
 
-install: all
+install-bin: all
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)
        - rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile
index 6ea5f14ec1c7102db1214e1fd42f7d69892c8641..c6dfc4e1a8fc6a743d84b5c5c59593b4b3a004af 100644 (file)
--- a/extras/cdrom_id/Makefile
+++ b/extras/cdrom_id/Makefile
@@ -44,8 +44,8 @@ clean:
 
 spotless: clean
 
 
 spotless: clean
 
-install: all
+install-bin: all
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)
        - rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/dasd_id/Makefile b/extras/dasd_id/Makefile
index f2c0595de0767c23f7a29d49c4346b3e63dc1817..23331ce14c4e2342f50f97ebb32c9000e04312bd 100644 (file)
--- a/extras/dasd_id/Makefile
+++ b/extras/dasd_id/Makefile
@@ -43,8 +43,8 @@ clean:
 
 spotless: clean
 
 
 spotless: clean
 
-install: all
+install-bin: all
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)
        - rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/edd_id/Makefile b/extras/edd_id/Makefile
index 627884a32918ee29c9006336cd7b11111b291d18..aa3db4f209316ee888a0486d239efe930af83a7f 100644 (file)
--- a/extras/edd_id/Makefile
+++ b/extras/edd_id/Makefile
@@ -43,8 +43,8 @@ clean:
 
 spotless: clean
 
 
 spotless: clean
 
-install: all
+install-bin: all
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)
        - rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/firmware/Makefile b/extras/firmware/Makefile
index 343d5295f148e11b9080873b9d62d07cbc4a3bd0..5632e0dee52ea60a3cce7c62933eada3da3dc255 100644 (file)
--- a/extras/firmware/Makefile
+++ b/extras/firmware/Makefile
@@ -44,8 +44,8 @@ clean:
 
 spotless: clean
 
 
 spotless: clean
 
-install: all
+install-bin: all
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)
        - rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/floppy/Makefile b/extras/floppy/Makefile
index 5380590c9b7645cdc332f4bc2210be689ed0ca3f..b7915fc484d0a02355b91a02cf88f569c2b7b33b 100644 (file)
--- a/extras/floppy/Makefile
+++ b/extras/floppy/Makefile
@@ -43,8 +43,8 @@ clean:
 
 spotless: clean
 
 
 spotless: clean
 
-install: all
+install-bin: all
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)
        - rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/run_directory/Makefile b/extras/run_directory/Makefile
index c1a83e3c0b78eac875ed5404c54989e271859636..38ef7b128ee528b8a60051b9d45328a8ea70abea 100644 (file)
--- a/extras/run_directory/Makefile
+++ b/extras/run_directory/Makefile
@@ -45,9 +45,9 @@ clean:
 
 spotless: clean
 
 
 spotless: clean
 
-install: all
+install-bin: all
        $(INSTALL_PROGRAM) $(DEVD) $(DESTDIR)$(sbindir)/$(DEVD)
        $(INSTALL_PROGRAM) $(HOTPLUGD) $(DESTDIR)$(sbindir)/$(HOTPLUGD)
 
        $(INSTALL_PROGRAM) $(DEVD) $(DESTDIR)$(sbindir)/$(DEVD)
        $(INSTALL_PROGRAM) $(HOTPLUGD) $(DESTDIR)$(sbindir)/$(HOTPLUGD)
 
-uninstall:
+uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(DEVD)
        - rm $(DESTDIR)$(sbindir)/$(DEVD)
diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index 3c38d6171e65b913038cf2bd09ed1a763094cd17..3b75e165fb3335f992db3b0129ed0d50822a1a50 100644 (file)
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -46,18 +46,23 @@ all:        $(PROG)
 
 # XXX use a compressed man page?
 
 
 # XXX use a compressed man page?
 
-install: all
+install-bin: all
        $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
        $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+
+install-man:
        $(INSTALL_DATA) -D scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8
        $(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
        
        @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)
        -rm $(DESTDIR)$(sbindir)/$(PROG)
+
+uninstall-man:
        -rm $(DESTDIR)$(mandir)/man8/scsi_id.8
        -rm $(DESTDIR)$(mandir)/man8/scsi_id.8
-       -rm $(DESTDIR)$(etcdir)/scsi_id.config
 
 GEN_HEADER=scsi_id_version.h
 
 
 GEN_HEADER=scsi_id_version.h
 
diff --git a/extras/usb_id/Makefile b/extras/usb_id/Makefile
index 4347fba4078c1c8f6da2d1fe0fce44b83c963aca..10dd09da21f38024632595cf6029cfd118ecee5a 100644 (file)
--- a/extras/usb_id/Makefile
+++ b/extras/usb_id/Makefile
@@ -44,8 +44,8 @@ clean:
 
 spotless: clean
 
 
 spotless: clean
 
-install: all
+install-bin: all
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)
        - rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 8ca3bd133325901d97bb90d5e2fc3f21ec147795..c1dd74f0f70285b677e462c45be66e20cef137e6 100644 (file)
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -47,8 +47,8 @@ clean:
 
 spotless: clean
 
 
 spotless: clean
 
-install: all
+install-bin: all
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)
        - rm $(DESTDIR)$(sbindir)/$(PROG)
Unnamed repository; edit this file 'description' to name the repository.