summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2015-06-24 22:20:24 +0000
committermatt <matt@NetBSD.org>2015-06-24 22:20:24 +0000
commit155e14460a6dd2ce5698ec5e260f778aa0809a1e (patch)
tree0eadb94ee2e50774b3860c60b74e1410a4f7fc46 /Makefile
parent38b13568739eaaff4dd0886c3ad6b9cda286b075 (diff)
Support building the xorg X11 libraries under MKCOMPAT.
Add XORG_MACHINE_ARCH to compat's bsd.*.mk Turn xorg makekeys and makestrs into real host tools which are installed into ${TOOLSDIR}
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ee218c87695..97e5e6c6937 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.313 2015/05/03 15:13:13 martin Exp $
+# $NetBSD: Makefile,v 1.314 2015/06/24 22:20:24 matt Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -485,6 +485,9 @@ do-x11: .PHONY .MAKE
.if ${X11FLAVOUR} == "Xorg"
${MAKEDIRTARGET} external/mit/xorg/tools all
${MAKEDIRTARGET} external/mit/xorg/lib build_install
+.if ${MKCOMPAT} != "no"
+ ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"
+.endif
.else
${MAKEDIRTARGET} x11 build
.endif