diff options
| author | ru <ru@FreeBSD.org> | 2003-07-30 14:33:32 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-07-30 14:33:32 +0000 |
| commit | 00c31c560dc7efbc44dec1790462d7c504464d97 (patch) | |
| tree | f0313ff764aa824722e918d72ace9e6e8a69d8f6 /release | |
| parent | ded8a0da62aa491917ea91ecc834bc46ae6c9002 (diff) | |
| download | FreeBSD-src-00c31c560dc7efbc44dec1790462d7c504464d97.zip FreeBSD-src-00c31c560dc7efbc44dec1790462d7c504464d97.tar.gz | |
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.
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
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) |
