From: Martin Mares <mj@ucw.cz>
Date: Mon, 24 Jan 2000 15:37:12 +0000 (+0000)
Subject: When installing man pages, use /usr/share/man if it exists (FHS 2.0
X-Git-Tag: v3.0.0~237
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=f8141ae2de288ee37ada39e6ce446f740c6ea599;p=pciutils.git

When installing man pages, use /usr/share/man if it exists (FHS 2.0
braindamage).
---

diff --git a/ChangeLog b/ChangeLog
index c615ab0..9e7229a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Jan 24 20:04:11 2000  Andreas Jaeger  <aj@suse.de>
+
+	* lib/i386-ports.c: Include <asm/io.h> only on systems without
+	glibc.
+
+Mon Jan 24 11:24:43 2000  Martin Mares  <mj@albireo.ucw.cz>
+
+	* Makefile: Modified to work with the Linux FHS brain-damaged idea
+	of putting man pages to /usr/share/man. Now we choose either /usr/man
+	or /usr/share/man depending on which one exists.
+
 Sun Jan 23 10:52:34 2000  Martin Mares  <mj@albireo.ucw.cz>
 
 	* pci.ids: Synced with Linux 2.3.40.
diff --git a/Makefile b/Makefile
index 8c1958e..96fe9a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.29 2000/01/23 05:57:04 mj Exp $
+# $Id: Makefile,v 1.30 2000/01/24 15:37:13 mj Exp $
 # Makefile for Linux PCI Utilities
-# (c) 1998--1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+# (c) 1998--2000 Martin Mares <mj@suse.cz>
 
 OPT=-O2 -fomit-frame-pointer
 #OPT=-O2 -g
@@ -18,6 +18,7 @@ else
 ROOT=/
 PREFIX=/usr
 endif
+MANDIR=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
 
 export
 
@@ -46,9 +47,10 @@ clean:
 
 install: all
 	# -c is ignored on Linux, but required on FreeBSD
+	install -d -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
-	install -c -m 644 lspci.8 setpci.8 $(PREFIX)/man/man8
+	install -c -m 644 lspci.8 setpci.8 $(MANDIR)/man8
 	# Remove relics from old versions
 	rm -f $(ROOT)/etc/pci.ids