From: "Jürg Billeter" <j@bitron.ch>
To: Greg KH <greg@kroah.com>
Cc: linux-hotplug-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org
Subject: Re: [ANNOUNCE] udev 069 release
Date: Wed, 14 Sep 2005 11:18:47 +0000 [thread overview]
Message-ID: <1126696727.3983.2.camel@juerg-pd.bitron.ch> (raw)
In-Reply-To: <20050913174848.GA6702@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
On Die, 2005-09-13 at 10:48 -0700, Greg KH wrote:
> Makefile: cleanup install targets
The extras Makefiles haven't been updated and thus break the install
targets. Something like the attached patch should help.
Regards,
Jürg
--
Jürg Billeter <j@bitron.ch>
[-- Attachment #2: udev-069-makefile-1.patch --]
[-- Type: text/x-patch, Size: 6120 bytes --]
diff -puNr udev-069.orig/extras/ata_id/Makefile udev-069/extras/ata_id/Makefile
--- udev-069.orig/extras/ata_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/ata_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/cdrom_id/Makefile udev-069/extras/cdrom_id/Makefile
--- udev-069.orig/extras/cdrom_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/cdrom_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/dasd_id/Makefile udev-069/extras/dasd_id/Makefile
--- udev-069.orig/extras/dasd_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/dasd_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/edd_id/Makefile udev-069/extras/edd_id/Makefile
--- udev-069.orig/extras/edd_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/edd_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/firmware/Makefile udev-069/extras/firmware/Makefile
--- udev-069.orig/extras/firmware/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/firmware/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/floppy/Makefile udev-069/extras/floppy/Makefile
--- udev-069.orig/extras/floppy/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/floppy/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/run_directory/Makefile udev-069/extras/run_directory/Makefile
--- udev-069.orig/extras/run_directory/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/run_directory/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/scsi_id/Makefile udev-069/extras/scsi_id/Makefile
--- udev-069.orig/extras/scsi_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/scsi_id/Makefile 2005-09-14 11:57:55.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/usb_id/Makefile udev-069/extras/usb_id/Makefile
--- udev-069.orig/extras/usb_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/usb_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/volume_id/Makefile udev-069/extras/volume_id/Makefile
--- udev-069.orig/extras/volume_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/volume_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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)
diff -puNr udev-069.orig/Makefile udev-069/Makefile
--- udev-069.orig/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/Makefile 2005-09-14 11:59:07.000000000 +0200
@@ -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:
WARNING: multiple messages have this Message-ID (diff)
From: "Jürg Billeter" <j@bitron.ch>
To: Greg KH <greg@kroah.com>
Cc: linux-hotplug-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org
Subject: Re: [ANNOUNCE] udev 069 release
Date: Wed, 14 Sep 2005 13:18:47 +0200 [thread overview]
Message-ID: <1126696727.3983.2.camel@juerg-pd.bitron.ch> (raw)
In-Reply-To: <20050913174848.GA6702@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
On Die, 2005-09-13 at 10:48 -0700, Greg KH wrote:
> Makefile: cleanup install targets
The extras Makefiles haven't been updated and thus break the install
targets. Something like the attached patch should help.
Regards,
Jürg
--
Jürg Billeter <j@bitron.ch>
[-- Attachment #2: udev-069-makefile-1.patch --]
[-- Type: text/x-patch, Size: 6120 bytes --]
diff -puNr udev-069.orig/extras/ata_id/Makefile udev-069/extras/ata_id/Makefile
--- udev-069.orig/extras/ata_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/ata_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/cdrom_id/Makefile udev-069/extras/cdrom_id/Makefile
--- udev-069.orig/extras/cdrom_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/cdrom_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/dasd_id/Makefile udev-069/extras/dasd_id/Makefile
--- udev-069.orig/extras/dasd_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/dasd_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/edd_id/Makefile udev-069/extras/edd_id/Makefile
--- udev-069.orig/extras/edd_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/edd_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/firmware/Makefile udev-069/extras/firmware/Makefile
--- udev-069.orig/extras/firmware/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/firmware/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/floppy/Makefile udev-069/extras/floppy/Makefile
--- udev-069.orig/extras/floppy/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/floppy/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/run_directory/Makefile udev-069/extras/run_directory/Makefile
--- udev-069.orig/extras/run_directory/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/run_directory/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/scsi_id/Makefile udev-069/extras/scsi_id/Makefile
--- udev-069.orig/extras/scsi_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/scsi_id/Makefile 2005-09-14 11:57:55.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/usb_id/Makefile udev-069/extras/usb_id/Makefile
--- udev-069.orig/extras/usb_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/usb_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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 -puNr udev-069.orig/extras/volume_id/Makefile udev-069/extras/volume_id/Makefile
--- udev-069.orig/extras/volume_id/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/extras/volume_id/Makefile 2005-09-14 11:57:13.000000000 +0200
@@ -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)
diff -puNr udev-069.orig/Makefile udev-069/Makefile
--- udev-069.orig/Makefile 2005-09-13 19:24:51.000000000 +0200
+++ udev-069/Makefile 2005-09-14 11:59:07.000000000 +0200
@@ -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:
next prev parent reply other threads:[~2005-09-14 11:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-13 17:48 [ANNOUNCE] udev 069 release Greg KH
2005-09-13 17:48 ` Greg KH
2005-09-13 18:33 ` Greg KH
2005-09-13 18:33 ` Greg KH
2005-09-14 11:18 ` Jürg Billeter [this message]
2005-09-14 11:18 ` Jürg Billeter
2005-09-14 15:32 ` Kay Sievers
2005-09-14 15:32 ` Kay Sievers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1126696727.3983.2.camel@juerg-pd.bitron.ch \
--to=j@bitron.ch \
--cc=greg@kroah.com \
--cc=linux-hotplug-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.