When the currently installed pci.ids file is newer than

the version to be installed, don't overwrite it.

diff --git a/ChangeLog b/ChangeLog
index 4765457d2698d971a33954295c45b6f7648b1eb0..0f1be5ca3f28dfa1a6d7a4ac4c8fc308413dc662 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-26  Martin Mares  <mj@ucw.cz>
+
+       * Makefile: When the currently installed pci.ids file is newer than
+       the version to be installed, don't overwrite it. Suggested by
+       Jean Delvare <khali@linux-fr.org>.
+
 2002-03-24  Martin Mares  <mj@ucw.cz>
 
        * lspci.c (show_pcix_bridge): Added PCI-X capability display.
@@ -18,6 +24,8 @@
 
 2001-11-04  Martin Mares  <mj@ucw.cz>
 
+       * Released as 2.1.9.
+
        * pci.ids: Synced with the PCI ID Repository at SourceForge
        (http://pciids.sourceforge.net/).
 

diff --git a/Makefile b/Makefile
index c288f68a784313e3c39f0a20b515f06ce2a11736..5f3ff91396b7e95727742e78588799b4ba706443 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.39 2002/03/24 12:35:39 mj Exp $
+# $Id: Makefile,v 1.40 2002/03/26 21:49:40 mj Exp $
 # Makefile for Linux PCI Utilities
 # (c) 1998--2002 Martin Mares <mj@ucw.cz>
 
@@ -57,12 +57,16 @@ clean:
        rm -rf dist
 
 install: all
-       # -c is ignored on Linux, but required on FreeBSD
+# -c is ignored on Linux, but required on FreeBSD
        $(DIRINSTALL) -m 755 $(ROOT)/sbin $(PREFIX)/share $(MANDIR)/man8
        $(INSTALL) -c -m 755 -s lspci setpci $(ROOT)/sbin
-       $(INSTALL) -c -m 644 pci.ids $(PREFIX)/share
+       if [ ! -f $(PREFIX)/share/pci.ids -o pci.ids -nt $(PREFIX)/share/pci.ids ] ; then \
+               $(INSTALL) -c -m 644 pci.ids $(PREFIX)/share ; \
+       elif [ -f $(PREFIX)/share/pci.ids ] ; then \
+               echo "$(PREFIX)/share/pci.ids is same or newer than the version to be installed, skipping." ; \
+       fi
        $(INSTALL) -c -m 644 lspci.8 setpci.8 $(MANDIR)/man8
-       # Remove relics from old versions
+# Remove relics from old versions
        rm -f $(ROOT)/etc/pci.ids
 
 uninstall: all