make install should not install any file in /etc.

5 files changed, 20 insertions, 7 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 088280e..dae9967 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.139 1996/07/13 04:33:23 jkh Exp $
+#	$Id: Makefile,v 1.140 1996/08/14 14:41:56 jkh Exp $
 
 # -rw-r--r--
 BINOWN= root
@@ -13,7 +13,8 @@ BIN1=   aliases amd.map csh.cshrc csh.login csh.logout dm.conf \
 	remote security services sysconfig shells \
 	syslog.conf ttys etc.${MACHINE}/disktab rpc make.conf \
 	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
-	${.CURDIR}/../usr.bin/mail/misc/mail.rc
+	${.CURDIR}/../usr.bin/mail/misc/mail.rc \
+	${.CURDIR}/../usr.bin/locate/locate/locate.rc
 
 # -rw-rw-rw-
 BIN2=	motd
@@ -26,6 +27,7 @@ NAMEDB=	PROTO.localhost.rev named.boot named.root make-localhost
 PPPCNF= ppp.conf.filter.sample ppp.conf.iij ppp.conf.sample \
 	ppp.linkup.sample ppp.secret.sample
 
+
 # Special top level files for FreeBSD
 COPYRIGHT=	COPYRIGHT
 FREEBSD=
@@ -55,6 +57,10 @@ distribution:
 	    ${DESTDIR}/var/cron/log; \
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 \
 	    master.passwd ${DESTDIR}/etc; \
+	( cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall );\
+	( cd ${.CURDIR}/../gnu/libexec/uucp/sample; ${MAKE} install ); \
+	( cd ${.CURDIR}/../usr.bin/file; ${MAKE} etc-magic ); \
+	( cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap ); \
 	pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd; \
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	     MAKEDEV.local etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev )
diff --git a/gnu/libexec/uucp/Makefile b/gnu/libexec/uucp/Makefile
index 13a2d23..a6b8ce5 100644
--- a/gnu/libexec/uucp/Makefile
+++ b/gnu/libexec/uucp/Makefile
@@ -1,8 +1,9 @@
 # This is the Makefile for Taylor UUCP
-# $Id: Makefile,v 1.2 1993/10/14 12:17:57 rgrimes Exp $
+# $Id: Makefile,v 1.3 1995/01/01 21:58:01 ache Exp $
 
+# subdir 'sample' called by /usr/src/etc/Makefile
 SUBDIR=		libunix libuucp libuuconf \
-		doc sample \
+		doc \
 		cu uuchk uucico uuconv uucp uulog uuname uupick uusched \
 		uustat uuto uux uuxqt
 
diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile
index 52fa57d..c2b19a6 100644
--- a/gnu/usr.bin/send-pr/Makefile
+++ b/gnu/usr.bin/send-pr/Makefile
@@ -30,6 +30,9 @@ send-pr.el:	send-pr-el.in Makefile
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		send-pr ${DESTDIR}${BINDIR}/send-pr
+
+# called from /usr/src/etc/Makefile 
+etc-gnats-freefall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 0644 \
 		${.CURDIR}/categories  ${DESTDIR}/etc/gnats/freefall
 
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index b45670e..806f677 100644
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -23,7 +23,9 @@ beforeinstall:
 	     ${DESTDIR}${BINDIR}/misc
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/map3270 \
 	     ${DESTDIR}${BINDIR}/misc
-	@rm -f ${DESTDIR}/etc/termcap
+
+etc-termcap:
+	rm -f ${DESTDIR}/etc/termcap
 	ln -s ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index d2cd561..efac409 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,6 +1,6 @@
 # Makefile for file(1) cmd.
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$Id: Makefile,v 1.3 1995/05/30 06:29:57 rgrimes Exp $
+# @(#)$Id: Makefile,v 1.4 1995/07/25 00:36:03 bde Exp $
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
@@ -50,7 +50,8 @@ all:	file magic
 magic:	$(MAGFILES)
 	cat $(MAGFILES) > $(.TARGET)
 
-afterinstall:
+# called from /usr/src/etc/Makefile 
+etc-magic:
 	${INSTALL} -c -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) magic \
 	$(DESTDIR)$(MAGIC)