[src/trunk]: src/etc/mtree Guard a few $MK... != "no" tests by an additional ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4971fca1866a
branches:  trunk
changeset: 339129:4971fca1866a
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jun 28 09:28:46 2015 +0000

description:
Guard a few $MK... != "no" tests by an additional defined(MK...) clause
and make the emit_dist_file target depend on EXTRA_DIST_FILES.
Part of fixing PR toolchain/50004.

diffstat:

 etc/mtree/Makefile |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 91f2ad9b07a6 -r 4971fca1866a etc/mtree/Makefile
--- a/etc/mtree/Makefile        Sun Jun 28 09:15:45 2015 +0000
+++ b/etc/mtree/Makefile        Sun Jun 28 09:28:46 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.27 2015/06/27 20:34:11 matt Exp $
+#      $NetBSD: Makefile,v 1.28 2015/06/28 09:28:46 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -12,7 +12,7 @@
 
 # XXX these are only used by compat currently, but they could be used
 # by something else; this may need to be fixed properly in the future.
-.if ${MKCOMPAT} != "no"
+.if defined(MKCOMPAT) && ${MKCOMPAT} != "no"
 .include "${NETBSDSRCDIR}/compat/archdirs.mk"
 .if exists(NetBSD.dist.${MACHINE_ARCH})
 EXTRA_DIST_FILES+=     ${.CURDIR}/NetBSD.dist.${MACHINE_ARCH}
@@ -20,14 +20,15 @@
 EXTRA_DIST_FILES+=     ${.CURDIR}/NetBSD.dist.earm
 .endif
 EXTRA_DIST_FILES+=     NetBSD.dist.compat      # autogenerated
-.if ${MKCOMPATX11} != "no" && ${MKX11} != "no" && ${X11FLAVOUR} == "Xorg"
+.if defined(MKCOMPATX11) && ${MKCOMPATX11} != "no" && ${MKX11} != "no" \
+       && ${X11FLAVOUR} == "Xorg"
 EXTRA_DIST_FILES+=     NetBSD.dist.xcompat     # autogenerated
 .endif
 .endif
 
 .if ${MKATF} != "no"
 EXTRA_DIST_FILES+=     ${.CURDIR}/NetBSD.dist.tests
-.if ${MKCOMPATTESTS} != "no"
+.if defined(MKCOMPATTESTS) && ${MKCOMPATTESTS} != "no"
 EXTRA_DIST_FILES+=     NetBSD.dist.tests.compat
 .endif
 .endif
@@ -83,7 +84,7 @@
 # /etc/mtree/NetBSD.dist content without duplicating logic from
 # the Makefile.
 #
-emit_dist_file:
+emit_dist_file:        ${EXTRA_DIST_FILES}
        @cat ${.CURDIR}/NetBSD.dist.base ${EXTRA_DIST_FILES}
 
 distrib-dirs: .PHONY check_DESTDIR NetBSD.dist