From ee551b73ca55e9abb3f8e63dceaf66d3eea31bf2 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Tue, 26 Mar 2002 21:49:40 +0000 Subject: [PATCH] When the currently installed pci.ids file is newer than the version to be installed, don't overwrite it. --- ChangeLog | 8 ++++++++ Makefile | 12 ++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4765457..0f1be5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-03-26 Martin Mares + + * Makefile: When the currently installed pci.ids file is newer than + the version to be installed, don't overwrite it. Suggested by + Jean Delvare . + 2002-03-24 Martin Mares * lspci.c (show_pcix_bridge): Added PCI-X capability display. @@ -18,6 +24,8 @@ 2001-11-04 Martin Mares + * 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 c288f68..5f3ff91 100644 --- 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 @@ -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 -- 2.39.2