[src/netbsd-1-4]: src/etc pullup 1.116->1.118 (gwr)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/942ea9a09f33
branches:  netbsd-1-4
changeset: 468759:942ea9a09f33
user:      perry <perry%NetBSD.org@localhost>
date:      Mon Jun 21 03:44:00 1999 +0000

description:
pullup 1.116->1.118 (gwr)

diffstat:

 etc/Makefile |  37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 deletions(-)

diffs (92 lines):

diff -r e68531eb569c -r 942ea9a09f33 etc/Makefile
--- a/etc/Makefile      Mon Jun 21 03:25:36 1999 +0000
+++ b/etc/Makefile      Mon Jun 21 03:44:00 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.112.2.4 1999/04/10 04:43:50 fair Exp $
+#      $NetBSD: Makefile,v 1.112.2.5 1999/06/21 03:44:00 perry Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -51,6 +51,12 @@
 BIN2=
 BIN3=
 
+# Directories to build in ${RELEASEDIR}.   MD Makefile.inc files can
+# add to this.
+# NOTE: Parent directories must be listed before subdirectories.
+INSTALLATION_DIRS= \
+       binary binary/sets binary/kernel binary/security installation
+
 .if exists(etc.${MACHINE}/Makefile.inc)
 .include "etc.${MACHINE}/Makefile.inc"
 .endif
@@ -215,11 +221,11 @@
        cd ${DESTDIR}; rm -f sys; ln -s usr/src/sys sys
 
 .if !defined(RELEASEDIR)
-release snapshot snap_pre:
+release snapshot snap_pre snap_md_pre snap_md_post:
        @echo setenv RELEASEDIR before doing that!
        @false
 .else
-release snapshot: distribution snap_pre snap_md snap_kern 
+release snapshot: distribution snap_pre snap_md_pre snap_kern snap_md_post
        sh ../distrib/sets/maketars -s ../distrib/sets \
                -d ${DESTDIR} -t ${RELEASEDIR}/binary/sets
 .if exists(../domestic) && !defined(EXPORTABLE_SYSTEM)
@@ -247,11 +253,9 @@
 snap_pre:
        /bin/rm -rf ${RELEASEDIR}
        ${INSTALL} -d -o root -g wheel -m 755 ${RELEASEDIR}
-       ${INSTALL} -d -o root -g wheel -m 755 ${RELEASEDIR}/binary
-       ${INSTALL} -d -o root -g wheel -m 755 ${RELEASEDIR}/binary/sets
-       ${INSTALL} -d -o root -g wheel -m 755 ${RELEASEDIR}/binary/kernel
-       ${INSTALL} -d -o root -g wheel -m 755 ${RELEASEDIR}/binary/security
-       ${INSTALL} -d -o root -g wheel -m 755 ${RELEASEDIR}/installation
+.for dir in ${INSTALLATION_DIRS}
+       ${INSTALL} -d -o root -g wheel -m 755 ${RELEASEDIR}/${dir}
+.endfor
 
 # the regular expression does a basename(1) on .CURDIR so that we don't
 # have to keep looking up .. at compile time.
@@ -272,6 +276,7 @@
 GETKERNELAWK=  awk '/^config/ {print $$2; found=1} \
                END{ if (found == 0) print "netbsd"; }'
 #
+.if !target(snap_kern)
 snap_kern:
        cd ${KERNCONFDIR} && config \
                -b ${KERNOBJDIR}/GENERIC -s ${KERNSRCDIR} GENERIC
@@ -282,6 +287,8 @@
        cd ${KERNOBJDIR}/GENERIC &&     \
                tar cf - `${GETKERNELAWK} ${KERNCONFDIR}/GENERIC` |\
                gzip -c -9 > ${RELEASEDIR}/binary/sets/kern.tgz
+# XXX use same loop for ${EXTRA_KERNELS} and ${BUILD_KERNELS} but
+# XXX only install ${EXTRA_KERNELS} in binary/kernel???
 .for configfile in ${EXTRA_KERNELS}
        cd ${KERNCONFDIR} && config \
                -b ${KERNOBJDIR}/${configfile} -s ${KERNSRCDIR} ${configfile}
@@ -295,10 +302,22 @@
                gzip -c -9 < $${kernel} > \
                        ${RELEASEDIR}/binary/kernel/$${kernel}.${configfile}.gz ; }
 .endfor # EXTRA_KERNELS
+.for configfile in ${BUILD_KERNELS}
+       cd ${KERNCONFDIR} && config \
+               -b ${KERNOBJDIR}/${configfile} -s ${KERNSRCDIR} ${configfile}
+.ifndef UPDATE
+       cd ${KERNOBJDIR}/${configfile} && ${MAKE} clean 
+.endif
+       cd ${KERNOBJDIR}/${configfile} && ${MAKE} depend && ${MAKE} ${_J}
+.endfor # BUILD_KERNELS
+.endif # no target(snap_kern)
 
 .endif # RELEASEDIR check
 
-snap_md:
+snap_md_pre:
+# nothing here -- look in the machine-dependent Makefile.inc
+
+snap_md_post:
 # nothing here -- look in the machine-dependent Makefile.inc
 
 .endif # DESTDIR check