Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.313
retrieving revision 1.318
diff -u -p -r1.313 -r1.318
--- src/Makefile	2015/05/03 15:13:13	1.313
+++ src/Makefile	2017/04/11 14:04:15	1.318
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.313 2015/05/03 15:13:13 martin Exp $
+#	$NetBSD: Makefile,v 1.318 2017/04/11 14:04:15 christos Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -98,8 +98,7 @@
 #                    if ${MKCOMPAT} != "no".
 #   do-build:        builds and installs the entire system.
 #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
-#                    X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"
-#                    or X11R6 from src/x11
+#                    X11R7 from src/external/mit/xorg 
 #   do-extsrc:       builds and installs extsrc if ${MKEXTSRC} != "no".
 #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
 #
@@ -137,7 +136,7 @@ _SRC_TOP_OBJ_=
 # _SUBDIR is used to set SUBDIR, after removing directories that have
 # BUILD_${dir}=no, or that have no ${dir}/Makefile.
 #
-_SUBDIR=	tools lib include gnu external crypto/external bin games
+_SUBDIR=	tools lib include external crypto/external bin games
 _SUBDIR+=	libexec sbin usr.bin
 _SUBDIR+=	usr.sbin share sys etc tests compat
 _SUBDIR+=	.WAIT rescue .WAIT distrib regress
@@ -164,7 +163,7 @@ afterinstall: .PHONY .MAKE
 	${MAKEDIRTARGET} share/man makedb
 .endif
 .if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
-	${MAKEDIRTARGET} gnu/usr.bin/texinfo/install-info infodir-meta
+	${MAKEDIRTARGET} external/gpl2/texinfo/bin/install-info infodir-meta
 .endif
 .if !defined(NOPOSTINSTALL)
 	${MAKEDIRTARGET} . postinstall-check
@@ -250,7 +249,6 @@ BUILDTARGETS+=	do-obsolete
 
 .ORDER:		${BUILDTARGETS}
 includes-lib:	.PHONY includes-include includes-sys
-includes-gnu:	.PHONY includes-lib
 
 #
 # Record the values of variables that might affect the build.
@@ -482,11 +480,10 @@ do-build: .PHONY .MAKE
 
 do-x11: .PHONY .MAKE
 .if ${MKX11} != "no"
-.if ${X11FLAVOUR} == "Xorg"
 	${MAKEDIRTARGET} external/mit/xorg/tools all
 	${MAKEDIRTARGET} external/mit/xorg/lib build_install
-.else
-	${MAKEDIRTARGET} x11 build
+.if ${MKCOMPATX11} != "no"
+	${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"
 .endif
 .else
 	@echo "MKX11 is not enabled"