summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrgrimes <rgrimes@FreeBSD.org>1995-05-13 19:51:57 +0000
committerrgrimes <rgrimes@FreeBSD.org>1995-05-13 19:51:57 +0000
commita34e9f94221abc7a879338d552d985cbbf8eae52 (patch)
tree9b6873e5bfd58cc7c9e343fbc2965800f6990601
parent33b9a83ec87b82b0a56a1bd5c7ff68c13ea70929 (diff)
downloadFreeBSD-src-a34e9f94221abc7a879338d552d985cbbf8eae52.zip
FreeBSD-src-a34e9f94221abc7a879338d552d985cbbf8eae52.tar.gz
Very minor rework to eliminate useage of - operator by checking for
existance of ${CHROOTDIR}. Remove -k option from make install for building chroot tree, makes it error out early if you forgot to populate the pre-chroot obj tree. Reviewed by: phk
-rw-r--r--release/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile
index b82dc03..609223c 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.154 1995/05/11 07:11:24 jkh Exp $
+# $Id: Makefile,v 1.155 1995/05/11 07:18:11 jkh Exp $
#
# How to roll a release:
#
@@ -62,12 +62,15 @@ release:
.if !defined(CHROOTDIR) || !defined(BUILDNAME)
@echo "To make a release you must set CHROOTDIR and BUILDNAME" && false
.endif
- -mkdir ${CHROOTDIR}
+.if exists(${CHROOTDIR})
chflags -R noschg ${CHROOTDIR}/.
rm -rf ${CHROOTDIR}/*
+.else
+ mkdir ${CHROOTDIR}
+.endif
cd ${.CURDIR}/../etc ; ${MAKE} distrib-dirs DESTDIR=${CHROOTDIR}
cd ${.CURDIR}/../etc ; ${MAKE} distribution DESTDIR=${CHROOTDIR}
- cd ${.CURDIR}/.. ; ${MAKE} -k install DESTDIR=${CHROOTDIR}
+ cd ${.CURDIR}/.. ; ${MAKE} install DESTDIR=${CHROOTDIR}
echo "#!/bin/sh" > ${CHROOTDIR}/mk
echo "set -ex" >> ${CHROOTDIR}/mk
echo "cd /usr/src" >> ${CHROOTDIR}/mk
OpenPOWER on IntegriCloud