Make installs better, install the FAQ stuff, don't install CVS-dirs.

3 files changed, 40 insertions, 8 deletions

diff --git a/share/FAQ/Makefile b/share/FAQ/Makefile
new file mode 100644
index 0000000..882971c
--- /dev/null
+++ b/share/FAQ/Makefile
@@ -0,0 +1,28 @@
+#	$Id: Makefile,v 1.10 1994/10/24 09:56:42 sos Exp $
+#
+# Doing a make install builds /usr/share/examples
+
+DDIR=	${DESTDIR}/usr/share/FAQ
+NOOBJ=	noobj
+
+# Define SHARED to indicate whether you want symbolic links to the system
+# source (``symlinks''), or a separate copy (``copies''); (latter useful
+# in environments where it's not possible to keep /sys publicly readable)
+SHARED?=	copies
+
+all clean cleandir depend lint tags:
+
+beforeinstall: ${SHARED}
+
+copies:
+	@${ECHO} installing ${DDIR}
+	rm -rf ${DDIR}
+	mkdir ${DDIR}
+	find . -print | grep -v /CVS | cpio -dumpv ${DDIR}
+
+symlinks:
+	@${ECHO} installing symlink to ${DDIR}
+	rm -rf ${DDIR}; \
+	ln -s ${.CURDIR} ${DDIR}; \
+
+.include <bsd.prog.mk>
diff --git a/share/Makefile b/share/Makefile
index cde4c98..9b562d5 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 # XXX BROKEN LINKS:	doc
-SUBDIR= dict examples man me misc mk skel syscons tabset termcap tmac zoneinfo
+SUBDIR= FAQ dict examples man me misc mk skel syscons \
+	tabset termcap tmac zoneinfo
 
 .include <bsd.subdir.mk>
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 3f748f8..efbe980 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -1,8 +1,11 @@
-#	$Id: Makefile,v 1.9 1994/09/25 03:11:27 ache Exp $
+#	$Id: Makefile,v 1.10 1994/10/24 09:56:42 sos Exp $
 #
 # Doing a make install builds /usr/share/examples
 
 DIRS=etc FreeBSD_version ibcs2 lkm sunrpc syscons
+
+DDIR=${DESTDIR}/usr/share/examples
+
 NOOBJ=	noobj
 
 # Define SHARED to indicate whether you want symbolic links to the system
@@ -15,17 +18,17 @@ all clean cleandir depend lint tags:
 beforeinstall: ${SHARED}
 
 copies:
-	@${ECHO} installing ${DESTDIR}/usr/share/examples
+	@${ECHO} installing ${DDIR}
 	@-for a in ${DIRS}; do \
-		rm -rf ${DESTDIR}/usr/share/examples/$$a; \
-		cp -rp $$a ${DESTDIR}/usr/share/examples; \
+		rm -rf ${DDIR}/$$a; \
 	done
+	find ${DIRS} -print | grep -v /CVS | cpio -dumpv ${DDIR}
 
 symlinks:
-	@${ECHO} installing symlinks in ${DESTDIR}/usr/share/examples
+	@${ECHO} installing symlinks in ${DDIR}
 	@-for a in ${DIRS}; do \
-		rm -rf ${DESTDIR}/usr/share/examples/$$a; \
-		ln -s ${.CURDIR}/$$a ${DESTDIR}/usr/share/examples; \
+		rm -rf ${DDIR}/$$a; \
+		ln -s ${.CURDIR}/$$a ${DDIR}; \
 	done
 
 .include <bsd.prog.mk>