[Pkg-pciutils-discuss] Time for a new release

[Matthew Wilcox]

On Fri, Aug 18, 2006 at 05:36:35AM -0600, Matthew Wilcox wrote:
> I suspect it's worth submitting a patch to add DESTDIR support.
> It's intertwined with pcimodules support right now, which is why I
> haven't been bothered to tackle it yet.

Here it is, complete with documentation.  I also removed the stale
documentation for ROOT since that option doesn't exist any more.

diff -urpN pciutils-2.2.4-pre4/Makefile pciutils-2.2.4-destdir/Makefile
--- pciutils-2.2.4-pre4/Makefile	2006-07-30 08:58:54.000000000 -0400
+++ pciutils-2.2.4-destdir/Makefile	2006-08-20 11:38:12.000000000 -0400
@@ -65,16 +65,16 @@ distclean: clean
 
 install: all
 # -c is ignored on Linux, but required on FreeBSD
-	$(DIRINSTALL) -m 755 $(SBINDIR) $(IDSDIR) $(MANDIR)/man8
-	$(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR)
-	$(INSTALL) -c -m 755 update-pciids $(SBINDIR)
-	$(INSTALL) -c -m 644 pci.ids $(IDSDIR)
-	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8
+	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL) -c -m 755 -s lspci setpci $(DESTDIR)$(SBINDIR)
+	$(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
+	$(INSTALL) -c -m 644 pci.ids $(DESTDIR)$(IDSDIR)
+	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
 
 uninstall: all
-	rm -f $(SBINDIR)/lspci $(SBINDIR)/setpci $(SBINDIR)/update-pciids
-	rm -f $(IDSDIR)/pci.ids
-	rm -f $(MANDIR)/man8/lspci.8 $(MANDIR)/man8/setpci.8 $(MANDIR)/man8/update-pciids.8
+	rm -f $(DESTDIR)$(SBINDIR)/lspci $(DESTDIR)$(SBINDIR)/setpci $(DESTDIR)$(SBINDIR)/update-pciids
+	rm -f $(DESTDIR)$(IDSDIR)/pci.ids
+	rm -f $(DESTDIR)$(MANDIR)/man8/lspci.8 $(DESTDIR)$(MANDIR)/man8/setpci.8 $(DESTDIR)$(MANDIR)/man8/update-pciids.8
 
 get-ids:
 	cp ~/tree/pciids/pci.ids pci.ids
diff -urpN pciutils-2.2.4-pre4/README pciutils-2.2.4-destdir/README
--- pciutils-2.2.4-pre4/README	2006-07-30 08:59:11.000000000 -0400
+++ pciutils-2.2.4-destdir/README	2006-08-20 15:48:03.000000000 -0400
@@ -45,9 +45,12 @@ The utilities include:  (See manual page
 Just run "make" to compile the package and then "make install" to install it.
 
 If you want to change the default installation location, please override
-the ROOT and PREFIX variables specified in the Makefile -- e.g., you can
-use "make PREFIX=/opt/pciutils ROOT=/opt/pciutils install" to create
-a separate installation not interfering with the rest of your system.
+the PREFIX variable specified in the Makefile -- e.g., you can use
+"make PREFIX=/opt/pciutils install" to create a separate installation
+not interfering with the rest of your system.  Setting the DESTDIR variable
+will allow you to install to a different directory from the one you intend
+to eventually run it from.  This is useful for people who are packaging
+pciutils to install on other computers.
 
 When you are bored of dumping PCI registers, just use "make uninstall".