summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1997-06-22 08:37:49 +0000
committerjkh <jkh@FreeBSD.org>1997-06-22 08:37:49 +0000
commit3bb8305ac5b6b7cc31d4ddc050dc51c4f5cedea5 (patch)
tree2ed07c8da51df14baddceb9216955e0e2563aa92 /release
parentf47045b4ae1a378fb1aa2607fbcb98b4458ee612 (diff)
downloadFreeBSD-src-3bb8305ac5b6b7cc31d4ddc050dc51c4f5cedea5.zip
FreeBSD-src-3bb8305ac5b6b7cc31d4ddc050dc51c4f5cedea5.tar.gz
Reshuffle some of the distribution names to make them
easier to remember & allow overrides.
Diffstat (limited to 'release')
-rw-r--r--release/Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/release/Makefile b/release/Makefile
index 9bab13d..49b7410 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.301 1997/06/21 15:45:51 jkh Exp $
+# $Id: Makefile,v 1.246.2.45 1997/06/21 19:40:04 jkh Exp $
#
# make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
#
@@ -28,11 +28,11 @@ BUILDNAME=${BASE}-${DATE}-SNAP
# Things which without too much trouble can be considered variables
# BIN_DISTS are special in that they get full /etc installation sets.
#
-COMPAT_DISTS= compat1x compat20 compat21
-EXPORT_DISTS= games manpages catpages proflibs dict info doc ${COMPAT_DISTS}
-EXTRA_DISTS= krb des
+COMPAT_DISTS?= compat1x compat20 compat21
+OTHER_DISTS?= games manpages catpages proflibs dict info doc
+CRYPTO_DISTS?= krb des
BIN_DISTS?= bin
-ALL_DISTS?= ${BIN_DISTS} ${EXPORT_DISTS} ${EXTRA_DISTS}
+DISTRIBUTIONS?= ${BIN_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS}
KERNELS?= GENERIC
# Extra source tarballs; each argument is a pair of source dir and
@@ -59,7 +59,6 @@ FIXITINODE= 2000
BOOTINODE= 100000
# Things which may get you into trouble if you change them
-DISTRIBUTIONS?= ${ALL_DISTS}
MTREEFILES= ${.CURDIR}/../etc/mtree
RD= /R/stage
FD= /R/ftp
@@ -315,7 +314,7 @@ release.5:
cd ${RD}/trees/bin/usr/share/misc && rm -f termcap.db vgrindefs.db
# Remove all the directories we don't need.
-cd ${RD}/trees && \
- find ${EXPORT_DISTS} ${EXTRA_DISTS} -depth -type d -print | xargs rmdir
+ find ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} -depth -type d -print | xargs rmdir
touch release.5
#
OpenPOWER on IntegriCloud