- Include pci.h in full distribution and use it instead of <linux/pci.h>

  when available. This should work-around all problems with Linus not
  synchronized with our PCI development.

- Fixed few cosmetic bugs (version in man pages etc.)

- Released as version 1.01.

diff --git a/ChangeLog b/ChangeLog
index e18cf27e2d1cb7fc539e811a19c729c8a706431b..7206cedcfd7f06150f74b884475a06d2d93f34de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Feb  9 13:17:43 1998  Martin Mares  <mj@albireo.ucw.cz>
+
+       * Makefile, pciutils.h: Include local pci.h instead of <linux/pci.h>
+       if available. This should avoid all problems with official kernel
+       not synchronized to newer PCI code in CVS -- standard distribution
+       of pciutils now contains pci.h from current CVS kernel, pciutils
+       in CVS contain no pci.h and use the correct kernel include.
+
+       * Makefile: Fixed installation path for man pages.
+
 Sat Feb  7 15:15:46 1998  Martin Mares  <mj@albireo.ucw.cz>
 
        * README: Updated.

diff --git a/Makefile b/Makefile
index 323e700d4cc7525d92c0bbad17ff4457bee03352..7dbdb1e149d612b6e7e343c98a2771ec9bf85c61 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
-# $Id: Makefile,v 1.5 1998/02/08 10:58:52 mj Exp $
+# $Id: Makefile,v 1.6 1998/02/09 12:32:52 mj Exp $
 # Makefile for Linux PCI Utilities
 # (c) 1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
 
 ARCH=$(shell uname -m | sed -e 's/i.86/i386/' -e 's/sun4u/sparc64/' | tr 'a-z' 'A-Z')
+KERN_H=$(shell if [ ! -f pci.h ] ; then echo '-DKERNEL_PCI_H' ; fi)
 OPT=-O2 -fomit-frame-pointer
-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wno-unused -Werror -DARCH_$(ARCH)
+CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wno-unused -Werror -DARCH_$(ARCH) $(KERN_H)
 
 PREFIX=/
+MANPREFIX=/usr
 
 all: lspci
 
@@ -17,12 +19,14 @@ names.o: names.c pciutils.h
 
 clean:
        rm -f `find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core`
-       rm -f lspci
+       rm -f lspci pci.h
 
 install: all
        install -o root -g root -m 755 -s lspci $(PREFIX)/sbin
        install -o root -g root -m 644 pci.ids $(PREFIX)/etc
-       install -o root -g root -m 644 lspci.8 $(PREFIX)/man/man8
+       install -o root -g root -m 644 lspci.8 $(MANPREFIX)/man/man8
 
 dist: clean
+       cp /usr/src/linux/include/linux/pci.h .
        sh -c 'X=`pwd` ; X=`basename $$X` ; cd .. ; tar czvvf /tmp/$$X.tar.gz $$X --exclude CVS --exclude tmp'
+       rm -f pci.h

diff --git a/README b/README
index 5c47c7250dd6ab935b41077ce74c17f3fc476d11..0c506849d0011a4b97c0e11c605ff259f8e128b0 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This package contains the Linux PCI Utilities, version 1.0.
+This package contains the Linux PCI Utilities, version 1.01.
 
 Copyright (c) 1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
 

diff --git a/lspci.8 b/lspci.8
index 91a483ede497f5585b2c1d87274511ae929e4403..954f7e8f1345d975c369e3f883e1391381053aa2 100644 (file)
--- a/lspci.8
+++ b/lspci.8
@@ -1,4 +1,4 @@
-.TH lspci 8 "7 February 98" "pciutils-0.92" "Linux PCI Utilities"
+.TH lspci 8 "9 February 98" "pciutils-1.01" "Linux PCI Utilities"
 .IX lspci
 .SH NAME
 lspci \- list all PCI devices

diff --git a/lspci.c b/lspci.c
index 2dc6ae4bd24e8f13f3a212858113feed96cfa365..fc2db61e02602c570f3cbdd65bfe9091f8c8d258 100644 (file)
--- a/lspci.c
+++ b/lspci.c
@@ -1,5 +1,5 @@
 /*
- *     $Id: lspci.c,v 1.6 1998/02/08 10:58:54 mj Exp $
+ *     $Id: lspci.c,v 1.7 1998/02/09 12:32:54 mj Exp $
  *
  *     Linux PCI Utilities -- List All PCI Devices
  *
@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <linux/pci.h>
 
 #include "pciutils.h"
 

diff --git a/pciutils.h b/pciutils.h
index 2bfc63ba487039dca1a673a7edce826012d187d7..ddbf67b10d983efeefad3eaea7d188931d94f684 100644 (file)
--- a/pciutils.h
+++ b/pciutils.h
@@ -1,5 +1,5 @@
 /*
- *     $Id: pciutils.h,v 1.2 1998/01/27 11:50:13 mj Exp $
+ *     $Id: pciutils.h,v 1.3 1998/02/09 12:32:56 mj Exp $
  *
  *     Linux PCI Utilities -- Declarations
  *
@@ -10,6 +10,12 @@
 
 #include <linux/types.h>
 
+#ifdef KERNEL_PCI_H
+#include <linux/pci.h>
+#else
+#include "pci.h"
+#endif
+
 #define PROC_BUS_PCI "/proc/bus/pci"
 #define ETC_PCI_IDS "/etc/pci.ids"
 

diff --git a/pciutils.lsm b/pciutils.lsm
index 7178cddbe059f17a6c128af6d0cef8e474bfaa25..7cada1b9584d703745fcfbcb8891e3e8d40ebb31 100644 (file)
--- a/pciutils.lsm
+++ b/pciutils.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title:          Linux PCI Utilities
-Version:        1.0
-Entered-date:   980207
+Version:        1.01
+Entered-date:   980209
 Description:    This package contains various utilities for inspecting and
                setting of devices connected to the PCI bus. Requires
                kernel version 2.1.82 or newer (supporting the /proc/bus/pci
@@ -9,7 +9,7 @@ Description:    This package contains various utilities for inspecting and
 Keywords:       kernel, pci, proc, lspci
 Author:         mj@atrey.karlin.mff.cuni.cz (Martin Mares)
 Maintained-by:  mj@atrey.karlin.mff.cuni.cz (Martin Mares)
-Primary-site:   atrey.karlin.mff.cuni.cz pub/local/mj/linux/pciutils-1.0.tar.gz
-Alternate-site: sunsite.unc.edu pub/Linux/system/hardware
+Primary-site:   atrey.karlin.mff.cuni.cz pub/local/mj/linux/pciutils-1.01.tar.gz
+Alternate-site: sunsite.unc.edu pub/Linux/system/hardware/pciutils-1.01.tar.gz
 Copying-policy: GPL
 End