From e46e3a531340729173192147a959ffedd5534a77 Mon Sep 17 00:00:00 2001
From: "Rodney W. Grimes" <rgrimes@FreeBSD.org>
Date: Tue, 8 Feb 1994 08:58:41 +0000
Subject: [PATCH] Add PERSONAL.ACKS to file list.

Use freefall.cf as sendmail prototype file, it is more realistic than the
tcpproto.cf file for a FreBSD system.  Fix so that obj dir is created in
sendmail/cf/cf as to not polute the source tree and to have the Makefile
in there do the right things.

Remove all the extra /dev/fd0?* entries on the floppies, they where using
up all the inodes and are not needed at this time.

Temporarily remove the floppy target from release: untilit is
fixed.

This file has lots more work coming, but to get the 1.1 BETA out I am
going to hand craft the floppies :-(.
---
 etc/Makefile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index 80e3fab19e75..6ddb53cb351a 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -27,7 +27,7 @@ WCS2=	fpevent fppwcs fppwcs_dual hdcwcs load_diags start_fpp wcs wcs_dual
 # Special top level files for FreeBSD
 COPYRIGHT=	COPYRIGHT
 FREEBSD=	CONTRIB.386BSD CONTRIB.FreeBSD
-FREEBSD+=	MIRROR.SITES RELNOTES.FreeBSD SUPPORT.TXT
+FREEBSD+=	MIRROR.SITES PERSONAL.ACKS RELNOTES.FreeBSD SUPPORT.TXT
 FREEBSD+=	${COPYRIGHT}
 #
 # Floppy drive name and files for building FreeBSD Floppies
@@ -77,9 +77,10 @@ CRYPT_LIB=	lib/libcrypt
 CRYPT_SRCS=	bin/ed bin/rcp
 CRYPT_SRCS+=	libexec/ftpd libexec/makekey libexec/rexecd libexec/rlogind
 CRYPT_SRCS+=	libexec/rshd libexec/telnetd libexec/uucpd
+CRYPT_SRCS+=	sbin/init.bsdi
 CRYPT_SRCS+=	usr.bin/bdes usr.bin/lock usr.bin/login usr.bin/passwd
 CRYPT_SRCS+=	usr.bin/rlogin usr.bin/rsh usr.bin/su usr.bin/telnet
-CRYPT_DIRS=	bin usr usr/bin usr/lib usr/libexec 
+CRYPT_DIRS=	bin sbin usr usr/bin usr/lib usr/libexec 
 
 all clean cleandir depend etc install lint:
 
@@ -156,8 +157,9 @@ distribution: distrib-dirs
 	(cd ../usr.sbin/sendmail/src; \
 	    ${MAKE} install; \
 	 cd ../cf/cf; \
-	    ${MAKE} tcpproto.cf; \
-	    install -o root -g wheel -m 644 tcpproto.cf \
+	    ${MAKE} obj; \
+	    ${MAKE} freefall.cf; \
+	    install -o root -g wheel -m 644 freefall.cf \
 	        ${DESTDIR}/etc/sendmail.cf)
 	(cd ../; \
 	    install -c -o root -g wheel -m 444 ${FREEBSD} ${DESTDIR}/)
@@ -199,7 +201,8 @@ kcopy-floppy:
 	(cd ${MOUNT}/dev; \
 	    sh ${DESTDIR}/dev/MAKEDEV std; \
 	    rm -rf fd; \
-	    sh ${DESTDIR}/dev/MAKEDEV fd0 wd0 sd0 sd1)
+	    sh ${DESTDIR}/dev/MAKEDEV fd0 wd0 sd0 sd1; \
+	    rm -rf fd0?* rfd0?*;)
 	(cd ${DESTDIR}/; \
 	    ls ${KC_FILES} | cpio -pdamuv ${MOUNT})
 	install -c -o root -g wheel -m 755 etc.i386/kc.profile \
@@ -243,7 +246,7 @@ filesystem-floppy:
 	    sh ${DESTDIR}/dev/MAKEDEV std; \
 	    rm -rf fd; \
 	    sh ${DESTDIR}/dev/MAKEDEV fd0 fd1 wd0 sd0 sd1; \
-	    rm -f rfd1[b-z] fd1[b-z])
+	    rm -f fd0?* fd1?* rfd0?* rfd1?*)
 	(cd ${DESTDIR}/; \
 	    ls ${FILESYSTEM_FILES} | cpio -pdamuv ${MOUNT})
 	install -c -o root -g wheel -m 755 etc.i386/inst1.profile \
@@ -452,7 +455,7 @@ distrib-dirs:
 floppies: kcopy-ah-floppy kcopy-bt-floppy filesystem-floppy \
 	  cpio-floppy
 
-release: release-dirs distribution kcopy-kernels floppies \
+release: release-dirs distribution kcopy-kernels \
 	 bin-tarball des-tarball
 	
 release-dirs: