Install lspci to /usr/bin on Linux systems

On Linux, lspci is useful even for ordinary users, although only
a subset of features is available.

diff --git a/Makefile b/Makefile
index aac99fc7c30e12af81b707558bbc687950bdb314..e9afb5762af18b387ea3ca1707f77ad9878ca64a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,7 @@ ABI_VERSION=.3
 
 # Installation directories
 PREFIX=/usr/local
+BINDIR=$(PREFIX)/bin
 SBINDIR=$(PREFIX)/sbin
 SHAREDIR=$(PREFIX)/share
 IDSDIR=$(SHAREDIR)
@@ -129,8 +130,9 @@ distclean: clean
 
 install: all
 # -c is ignored on Linux, but required on FreeBSD
-       $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)/$(MANDIR)/man5
-       $(INSTALL) -c -m 755 $(STRIP) lspci$(EXEEXT) setpci$(EXEEXT) $(DESTDIR)$(SBINDIR)
+       $(DIRINSTALL) -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)/$(MANDIR)/man5
+       $(INSTALL) -c -m 755 $(STRIP) lspci$(EXEEXT) $(DESTDIR)$(LSPCIDIR)
+       $(INSTALL) -c -m 755 $(STRIP) setpci$(EXEEXT) $(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

diff --git a/lib/configure b/lib/configure
index 90692482249541d161611387a679e0c7b52da451..181de6077582b2b6c8fa7bd34d59b4f06c23a596 100755 (executable)
--- a/lib/configure
+++ b/lib/configure
@@ -64,6 +64,7 @@ LIBRESOLV=-lresolv
 LIBEXT=so
 EXEEXT=
 SYSINCLUDE=/usr/include
+LSPCIDIR=SBINDIR
 
 case $sys in
        linux*)
@@ -79,6 +80,7 @@ case $sys in
                                                ;;
                esac
                echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
+               LSPCIDIR=BINDIR
                ;;
        sunos)
                case $cpu in
@@ -177,6 +179,7 @@ esac
 
 echo >>$m "LIBEXT="$LIBEXT
 echo >>$m "EXEEXT="$EXEEXT
+echo >>$m "LSPCIDIR=\$($LSPCIDIR)"
 echo >>$c '#define PCI_HAVE_PM_DUMP'
 echo " dump"