summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2003-03-17 05:46:10 +0000
committerobrien <obrien@FreeBSD.org>2003-03-17 05:46:10 +0000
commit1145aeb821b1aa2f421d9a94d6738dd2d58990a0 (patch)
treea094f6e5d9ade4e21369bcc3959e943c965c54bf /release
parent0d1bd6d896a3eedcade2ce101a06fb14b58c6a86 (diff)
downloadFreeBSD-src-1145aeb821b1aa2f421d9a94d6738dd2d58990a0.zip
FreeBSD-src-1145aeb821b1aa2f421d9a94d6738dd2d58990a0.tar.gz
Use positive logic rather than harder-to-read negative logic.
Diffstat (limited to 'release')
-rw-r--r--release/Makefile42
1 files changed, 21 insertions, 21 deletions
diff --git a/release/Makefile b/release/Makefile
index 7139ccf..9890d42 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -457,10 +457,10 @@ release rerelease:
echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${CHROOTDIR}/mk
echo " touch /tmp/.world_done" >> ${CHROOTDIR}/mk
echo "fi" >> ${CHROOTDIR}/mk
-.if !defined(NOPORTS) && !defined(NOPORTREADMES)
- echo "if true; then" >> ${CHROOTDIR}/mk
-.else
+.if defined(NOPORTS) || defined(NOPORTREADMES)
echo "if false; then" >> ${CHROOTDIR}/mk
+.else
+ echo "if true; then" >> ${CHROOTDIR}/mk
.endif
echo " echo \">>> make readmes started on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk
echo " cd /usr/ports" >> ${CHROOTDIR}/mk
@@ -906,25 +906,25 @@ cdrom.1:
touch cdrom.1
iso.1:
- @if [ -r ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ]; then \
- echo "Creating ISO images..."; \
- sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
- fbsd_miniinst \
- ${CD}/${BUILDNAME}-${TARGET}-miniinst.iso ${CD_DISC1}; \
- sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
- fbsd_livefs \
- ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2}; \
- if [ "x${CD_EXTRA_BITS}" != "x" ]; then \
- sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
- ${BOOTABLE} fbsd_boot \
- ${CD}/${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} \
- ${CD_EXTRA_BITS} \
- && false; \
- fi \
- else \
- echo "Do not know how to create an ISO for ${TARGET_ARCH}."; \
- fi
+.if exist(${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh)
+ @echo "Creating ISO images..."
+ @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
+ fbsd_miniinst \
+ ${CD}/${BUILDNAME}-${TARGET}-miniinst.iso ${CD_DISC1}; \
+ @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
+ fbsd_livefs \
+ ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2}; \
+.if defined(CD_EXTRA_BITS)
+ @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
+ ${BOOTABLE} fbsd_boot \
+ ${CD}/${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} \
+ ${CD_EXTRA_BITS} \
+ && false
+.endif
touch iso.1
+.else
+ @echo "Do not know how to create an ISO for ${TARGET_ARCH}."; \
+.endif
#
# --==## Documentation Project files such as the Handbook and FAQ ##==--
OpenPOWER on IntegriCloud