From 8dab7e1cb378a55b57a7bca6bc66a7ecc091d41f Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Sun, 31 Oct 2004 21:27:24 +0000
Subject: [PATCH] Put man pages in /usr/share/man under Linux.

---
 chat/Makefile.linux                | 6 +++---
 linux/Makefile.top                 | 2 +-
 pppd/Makefile.linux                | 4 ++--
 pppd/plugins/Makefile.linux        | 2 +-
 pppd/plugins/radius/Makefile.linux | 2 +-
 pppdump/Makefile.linux             | 2 +-
 pppstats/Makefile.linux            | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/chat/Makefile.linux b/chat/Makefile.linux
index c74e197..31a5676 100644
--- a/chat/Makefile.linux
+++ b/chat/Makefile.linux
@@ -1,8 +1,8 @@
-#	$Id: Makefile.linux,v 1.11 2004/10/29 00:12:27 paulus Exp $
+#	$Id: Makefile.linux,v 1.12 2004/10/31 21:27:24 paulus Exp $
 
 DESTDIR = @DESTDIR@
 BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/man
+MANDIR = $(DESTDIR)/share/man/man8
 
 CDEF1=	-DTERMIOS			# Use the termios structure
 CDEF2=	-DSIGTYPE=void			# Standard definition
@@ -26,7 +26,7 @@ chat.o:	chat.c
 install: chat
 	mkdir -p $(BINDIR)
 	$(INSTALL) -s -c chat $(BINDIR)
-	$(INSTALL) -c -m 644 chat.8 $(MANDIR)/man8
+	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
 
 clean:
 	rm -f chat.o chat *~
diff --git a/linux/Makefile.top b/linux/Makefile.top
index 62f5ba2..fba9bcd 100644
--- a/linux/Makefile.top
+++ b/linux/Makefile.top
@@ -3,7 +3,7 @@
 DESTDIR = @DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 INCDIR = $(DESTDIR)/include
-MANDIR = $(DESTDIR)/man
+MANDIR = $(DESTDIR)/share/man
 ETCDIR = @SYSCONF@/ppp
 
 # uid 0 = root
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 2cdfe9e..a5df637 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,12 +1,12 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.62 2004/10/29 00:12:27 paulus Exp $
+# $Id: Makefile.linux,v 1.63 2004/10/31 21:27:24 paulus Exp $
 #
 
 # Default installation locations
 DESTDIR = @DESTDIR@
 BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/man/man8
+MANDIR = $(DESTDIR)/share/man/man8
 INCDIR = $(DESTDIR)/include
 
 TARGETS = pppd
diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
index c2c9146..2352765 100644
--- a/pppd/plugins/Makefile.linux
+++ b/pppd/plugins/Makefile.linux
@@ -6,7 +6,7 @@ INSTALL	= install -o root
 
 DESTDIR = @DESTDIR@
 BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/man
+MANDIR = $(DESTDIR)/share/man/man8
 LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
 
 SUBDIRS := rp-pppoe
diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
index 96d5c78..50d4799 100644
--- a/pppd/plugins/radius/Makefile.linux
+++ b/pppd/plugins/radius/Makefile.linux
@@ -4,7 +4,7 @@
 #
 
 DESTDIR = @DESTDIR@
-MANDIR = $(DESTDIR)/man/man8
+MANDIR = $(DESTDIR)/share/man/man8
 LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
 
 INSTALL	= install -o root
diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
index e2e959a..197e897 100644
--- a/pppdump/Makefile.linux
+++ b/pppdump/Makefile.linux
@@ -1,6 +1,6 @@
 DESTDIR = @DESTDIR@
 BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/man/man8
+MANDIR = $(DESTDIR)/share/man/man8
 
 CFLAGS= -O -I../include/net
 OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
index 9b0a7e8..c97cf32 100644
--- a/pppstats/Makefile.linux
+++ b/pppstats/Makefile.linux
@@ -1,10 +1,10 @@
 #
 # pppstats makefile
-# $Id: Makefile.linux,v 1.6 2004/10/29 00:12:27 paulus Exp $
+# $Id: Makefile.linux,v 1.7 2004/10/31 21:27:24 paulus Exp $
 #
 DESTDIR = @DESTDIR@
 BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/man/man8
+MANDIR = $(DESTDIR)/share/man/man8
 
 PPPSTATSRCS = pppstats.c
 PPPSTATOBJS = pppstats.o
-- 
2.39.2