Re: [PATCH] DESTDIR for udev

[Olaf Hering <olh@suse.de>]

 On Wed, Oct 29, Olaf Hering wrote:

>  On Tue, Oct 28, Greg KH wrote:
> 
> > On Tue, Oct 28, 2003 at 05:04:06PM +0100, Olaf Hering wrote:
> > > For these distro guys.
> > > make install DESTDIR=/tmp/foobar
> > 
> > What's wrong with the existing makefile where you can do:
> > 	make install prefix=/tmp/foobar
> > 
> > That's what the RPM currently does.
> 
> The hotplug symlink looks bogus. DESTDIR is for packaging, not for
> --prefix.

This is a more complete patch.
You already noticed the bogus symlink /etc/hotplug.d/default/udev.hotplug


diff -p -purN udev.bk.orig/Makefile udev.bk/Makefile
--- udev.bk.orig/Makefile	2003-10-25 01:21:18.000000000 +0200
+++ udev.bk/Makefile	2003-10-29 12:52:52.000000000 +0100
@@ -26,6 +26,7 @@ VERSION =	005
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 
+DESTDIR  # override this to make udev look in a different location for it's config files
 prefix  exec_prefix =	${prefix}
@@ -195,14 +196,14 @@ release: $(DISTFILES) clean
 
 
 install: all
-	$(INSTALL) -d $(udevdir)
-	$(INSTALL) -d $(configdir)
-	$(INSTALL) -d $(hotplugdir)
-	$(INSTALL_PROGRAM) -D $(ROOT) $(sbindir)/$(ROOT)
-	$(INSTALL_DATA) -D udev.8 $(mandir)/man8/udev.8
-	$(INSTALL_DATA) udev.config $(configdir)
-	$(INSTALL_DATA) udev.permissions $(configdir)
-	- ln -s $(sbindir)/$(ROOT) $(hotplugdir)/udev.hotplug
+	$(INSTALL) -d $(DESTDIR)$(udevdir)
+	$(INSTALL) -d $(DESTDIR)$(configdir)
+	$(INSTALL) -d $(DESTDIR)$(hotplugdir)
+	$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
+	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
+	$(INSTALL_DATA) udev.config $(DESTDIR)$(configdir)
+	$(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir)
+	- ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
 
 uninstall:
 	- rm $(hotplugdir)/udev.hotplug
diff -p -purN udev.bk.orig/udev.spec udev.bk/udev.spec
--- udev.bk.orig/udev.spec	2003-10-23 02:08:58.000000000 +0200
+++ udev.bk/udev.spec	2003-10-29 12:53:59.000000000 +0100
@@ -7,7 +7,7 @@ Group: Utilities/System
 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.gz
 ExclusiveOS: Linux
 Vendor: Greg Kroah-Hartman <greg@kroah.com>
-BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Prereq: /bin/sh, fileutils, hotplug
 
 %description
@@ -21,9 +21,7 @@ udev is a implementation of devfs in use
 make CC="gcc $RPM_OPT_FLAGS"
 
 %install
-make prefix=$RPM_BUILD_ROOT install
-rm -f ${RPM_BUILD_ROOT}/etc/hotplug.d/default/udev.hotplug
-ln -s /sbin/udev ${RPM_BUILD_ROOT}/etc/hotplug.d/default/udev.hotplug
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, n√úRNBERG


-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel