diff options
| author | he <he@NetBSD.org> | 2009-09-08 09:57:32 +0000 |
|---|---|---|
| committer | he <he@NetBSD.org> | 2009-09-08 09:57:32 +0000 |
| commit | 3da5eccbbc24014fb4bb62b35f34753d7cf4d8bf (patch) | |
| tree | a87c9610bb10f68a3451fcffe96e806ac3daf230 | |
| parent | 79090dc96ab25e33e068ff2f7663eb7bbc6b9d7b (diff) | |
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.
| -rw-r--r-- | etc/mtree/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index 8c3a34029c2..fbf534c4896 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -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 |
