From fe7056555cf3755fc1e6f7510a1d98e4048cb99d Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Mon, 17 May 2004 07:00:16 +0000
Subject: [PATCH] Move '${MAKEDIRTARGET} x11 distribution' from
 Makefile::distribution to etc/Makefile::distribution, and only perform if
 ${MKX11}!=no. Should fix a problem experienced by Alistair whilst doing a
 "make release".

---
 Makefile     | 3 +--
 etc/Makefile | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f52176117ca9..c8b78554f9a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.233 2004/05/16 10:27:21 lukem Exp $
+#	$NetBSD: Makefile,v 1.234 2004/05/17 07:00:16 lukem Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -240,7 +240,6 @@ distribution buildworld: .PHONY
 	@false
 .endif
 	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
-	${MAKEDIRTARGET} x11 distribution
 	${MAKEDIRTARGET} etc distribution INSTALL_DONE=1
 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
 	${MAKEDIRTARGET} . postinstall-fix-obsolete
diff --git a/etc/Makefile b/etc/Makefile
index 7d594221577c..d506922c6b2c 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.287 2004/05/16 09:53:09 lukem Exp $
+#	$NetBSD: Makefile,v 1.288 2004/05/17 07:00:16 lukem Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -142,6 +142,9 @@ distribution: .PHONY check_DESTDIR .WAIT distrib-dirs
 	${MAKEDIRTARGET} ${NETBSDSRCDIR} install _DISTRIB=
 .endif	# !INSTALL_DONE
 	${MAKEDIRTARGET} . install-etc-files
+.if ${MKX11} != "no"
+	${MAKEDIRTARGET} ${NETBSDSRCDIR}/x11 distribution
+.endif
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets makesetfiles
 .endif	# !DISTRIBUTION_DONE