summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2003-10-31 13:15:07 +0000
committerru <ru@FreeBSD.org>2003-10-31 13:15:07 +0000
commit6f573248c3898a7b0c72c3fa651ddcd6d99f6c43 (patch)
tree19a34d69e0435fe07fb1f6e277dd5c22daf1ec07
parentc544392c8d732fb61388c1c754880e6b3f11a274 (diff)
downloadFreeBSD-src-6f573248c3898a7b0c72c3fa651ddcd6d99f6c43.zip
FreeBSD-src-6f573248c3898a7b0c72c3fa651ddcd6d99f6c43.tar.gz
Combining "all" and "install" in one invocation is a very bad idea as
conditional evaluation is done only once in this case, and this may not account for the fact that some conditionals would be evaluated differently if "all" has already been run, like is the case with the loader.help existance check in sys/boot/alpha/common/Makefile.common, beforeinstall target. This should fix Alpha snapshot builds.
-rw-r--r--release/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile
index 31786c2..3e38f96 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -669,7 +669,8 @@ release.9:
.if exists(${.CURDIR}/../sys/boot/${TARGET}/loader)
cd ${.CURDIR}/../sys/boot/${TARGET}/loader; \
${WMAKE} clean cleandepend; \
- ${WMAKE} -DNOMAN -DNOFORTH all install DESTDIR=${RD}/trees/special
+ ${WMAKE} -DNOMAN -DNOFORTH all; \
+ ${WMAKE} -DNOMAN -DNOFORTH install DESTDIR=${RD}/trees/special
.endif
cp ${RD}/trees/base/etc/disktab /etc
rm -rf ${RD}/mfsfd
OpenPOWER on IntegriCloud