[src/trunk]: src/etc/mtree Allow builds without X11 to succeed. The previous...

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

details:   https://anonhg.NetBSD.org/src/rev/a52570549c16
branches:  trunk
changeset: 747282:a52570549c16
user:      he <he%NetBSD.org@localhost>
date:      Tue Sep 08 09:57:32 2009 +0000

description:
Allow builds without X11 to succeed.  The previous change when used
in this situation caused the contents of ${.CURDIR} to be cat'ed
into the generated NetBSD.dist mtree spec file, resulting in
${DESTDIR}/var/yp/binding/<garbage> being created, causing set list
check failure at the end of the build.

diffstat:

 etc/mtree/Makefile |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r ad52801232e2 -r a52570549c16 etc/mtree/Makefile
--- a/etc/mtree/Makefile        Tue Sep 08 09:50:56 2009 +0000
+++ b/etc/mtree/Makefile        Tue Sep 08 09:57:32 2009 +0000
@@ -1,19 +1,19 @@
-#      $NetBSD: Makefile,v 1.6 2009/09/07 19:34:30 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2009/09/08 09:57:32 he Exp $
 
 .include <bsd.own.mk>
 
 .if ${MKX11} != "no"
 . if ${X11FLAVOUR} == "Xorg"
-NETBSD_DIST_X11_FILE=  NetBSD.dist.Xorg
+NETBSD_DIST_X11_FILE=  ${.CURDIR}/NetBSD.dist.Xorg
 . else
-NETBSD_DIST_X11_FILE=  NetBSD.dist.XFree86
+NETBSD_DIST_X11_FILE=  ${.CURDIR}/NetBSD.dist.XFree86
 . endif
 .else
 NETBSD_DIST_X11_FILE=
 .endif
 
 NetBSD.dist:   NetBSD.dist.base ${NETBSD_DIST_X11_FILE}
-       ${TOOL_CAT} ${.CURDIR}/NetBSD.dist.base ${.CURDIR}/${NETBSD_DIST_X11_FILE} > ${.TARGET}
+       ${TOOL_CAT} ${.CURDIR}/NetBSD.dist.base ${NETBSD_DIST_X11_FILE} > ${.TARGET}
 
 CONFIGFILES=   NetBSD.dist special
 FILESDIR=      /etc/mtree