From 0b307156c92f61c1a02d232f4c6ed17e888de9a9 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Wed, 9 Feb 2022 21:20:50 +0100 Subject: [PATCH] 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. --- Makefile | 6 ++++-- lib/configure | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index aac99fc..e9afb57 100644 --- 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 9069248..181de60 100755 --- 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" -- 2.39.2