Module Name: src
Committed By: he
Date: Tue Sep 8 09:57:32 UTC 2009
Modified Files:
src/etc/mtree: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/etc/mtree/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.6 src/etc/mtree/Makefile:1.7
--- src/etc/mtree/Makefile:1.6 Mon Sep 7 19:34:30 2009
+++ src/etc/mtree/Makefile Tue Sep 8 09:57:32 2009
@@ -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
