From 00c31c560dc7efbc44dec1790462d7c504464d97 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Wed, 30 Jul 2003 14:33:32 +0000
Subject: Initialize the FIXCRYPTO, BINMAKE and related variables (that use the
 != operator) only when needed.

This change allows me to check out the current version of release/
makefiles only (co -l) to /tmp/release, and use that directory to
build a release (supplying the correct WORLDDIR).

Without this, attempt to "make release" caused an endless fork bomb
while trying to evaluate FIXCRYPTO, and the only way I could get
away from this on a remote box was to "kill -INT 1", thanks to
tcsh(1) and its internal "kill" command.
---
 release/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'release')

diff --git a/release/Makefile b/release/Makefile
index 703848b..e0f0b6e 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -238,7 +238,7 @@ DISKLABEL?=		disklabel
 ZIPNSPLIT=		gzip --no-name -9 -c | split -b 1423k -
 
 # Things that need to be compiled without crypto support in releases
-.if !defined(FIXCRYPTO)
+.if !defined(FIXCRYPTO) && !make(release) && !make(rerelease)
 FIXCRYPTO!=	cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS; \
 		cd ${.CURDIR}/../secure; ${MAKE} -V SPROGS
 .endif
@@ -295,10 +295,12 @@ BOOTABLE="-b"
 DOCREL= doc.1 doc.2
 .endif
 
+.if !make(release) && !make(rerelease)
 BINMAKE!=	cd ${.CURDIR}/..; ${MAKE} -V BINMAKE
 WMAKEENV!=	cd ${.CURDIR}/..; \
 		${BINMAKE} ${CROSSENV} -f Makefile.inc1 -V WMAKEENV
 WMAKE=		${WMAKEENV} ${BINMAKE}
+.endif
 
 CVS_SRCARGS=	-P
 .if defined(RELEASETAG)
-- 
cgit v1.1