Brought in NetBSD Makefile, which was then fixed up to use mtree for

building the distrubution hierarchy.  Still needs some work, but atleast
this version runs and does most of the right things.

1 files changed, 33 insertions, 13 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 52225d6..83a6319 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,18 +1,26 @@
 #	@(#)Makefile	5.11 (Berkeley) 5/21/91
 
+LOCALTIME=	US/Pacific
+TZDIR=/usr/share/zoneinfo
+
 NOOBJ=	oobj
 
 # disktab may be wrong -- hcx9 is a tahoe, but gets its own.
 # -rw-r--r--
-BIN1=	aliases csh.cshrc csh.login csh.logout crontab daily dm.conf \
+BINOWN= root
+BINGRP= wheel
+BIN1=	aliases csh.cshrc csh.login csh.logout dm.conf \
 	ftpusers gettytab group hosts hosts.equiv hosts.lpd inetd.conf \
-	man.conf monthly motd netstart phones printcap protocols rc \
-	rc.local remote security services shells syslog.conf ttys weekly \
-	etc.${MACHINE}/disktab
+	man.conf motd myname netstart phones \
+	printcap protocols rc rc.local remote security services shells \
+	syslog.conf ttys etc.${MACHINE}/disktab rpc
 
 # -rw-rw-rw-
 BIN2=	motd
 
+# -rwxr-xr-x root.wheel, for the new f***ing cron root.wheel
+BIN3=	daily weekly monthly
+
 MTREE=	BSD.root.dist BSD.usr.dist BSD.var.dist
 NAMEDB=	localhost.rev named.boot root.cache
 PCS=	pcs750.bin
@@ -21,17 +29,16 @@ WCS2=	fpevent fppwcs fppwcs_dual hdcwcs load_diags start_fpp wcs wcs_dual
 
 all clean cleandir depend etc install lint:
 
-distribution:
+distribution: distrib-dirs
 	install -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} ${DESTDIR}/etc
 	install -c -o ${BINOWN} -g ${BINGRP} -m 666 ${BIN2} ${DESTDIR}/etc
+	install -c -o root -g wheel -m 755 ${BIN3} ${DESTDIR}/etc
+	install -c -o root -g wheel -m 600 crontab ${DESTDIR}/var/cron/tabs/root
 	install -c -o root -g wheel -m 600 master.passwd ${DESTDIR}/etc
-	(cd ${DESTDIR}/etc; \
-	    pwd_mkdb -p master.passwd; \
-	    mv master.passwd.pag passwd.pag; \
-	    mv master.passwd.dir passwd.dir; \
-	    mv master.passwd.orig passwd)
+	(cd ${DESTDIR}/etc; pwd_mkdb -p master.passwd)
 	install -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	     MAKEDEV.local etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev
+	(cd ${DESTDIR}/dev; sh MAKEDEV all)
 	(cd root; \
 		install -c -o root -g wheel -m 644 dot.cshrc \
 		    ${DESTDIR}/root/.cshrc; \
@@ -48,18 +55,24 @@ distribution:
 	    ${DESTDIR}/etc/mtree
 	cd namedb; install -c -o ${BINOWN} -g ${BINGRP} -m 644 ${NAMEDB} \
 	    ${DESTDIR}/etc/namedb
+	/bin/rm -f ${DESTDIR}/etc/localtime
+	ln -s ${TZDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime
 	install -c -o ${BINOWN} -g operator -m 664 /dev/null \
 	    ${DESTDIR}/etc/dumpdates
+	install -c -o nobody -g ${BINGRP} -m 664 /dev/null \
+	    ${DESTDIR}/var/db/locate.database
 	install -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
-	    ${DESTDIR}/var/log/messages
+	    ${DESTDIR}/var/log/lpd-errs
 	install -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 	    ${DESTDIR}/var/log/maillog
 	install -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
-	    ${DESTDIR}/var/log/lpd-errs
+	    ${DESTDIR}/var/log/messages
+	install -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+	    ${DESTDIR}/var/log/wtmp
 	install -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 	    ${DESTDIR}/var/run/utmp
 	(cd etc.${MACHINE}; install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    fstab.* ${DESTDIR}/)
+	    fstab.* ${DESTDIR}/etc)
 .if ${MACHINE} == "tahoe"
 	(cd etc.tahoe; install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${WCS1} \
 	    ${DESTDIR}/)
@@ -73,4 +86,11 @@ hcx9-distribution:
 	(cd etc.tahoe; install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${WCS2} \
 	    ${DESTDIR}/)
 
+distrib-dirs:
+	mtree -du -f mtree/BSD.root.dist -p ${DESTDIR}
+	mtree -u -f mtree/BSD.var.dist -p ${DESTDIR}/var
+	mtree -u -f mtree/BSD.usr.dist -p ${DESTDIR}/usr
+	(cd ${DESTDIR}; rm -f ${DESTDIR}/sys; \
+	    ln -s usr/src/sys.386bsd sys )
+
 .include <bsd.prog.mk>