Mon Jan 25 18:00:26 2016 UTC ()
Include <bsd.own.mk> before setting any MK variables, so that /etc/mk.conf
is processed first, and it's settings don't override ours.
(christos)
diff -r1.8 -r1.9 src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -r1.3 -r1.4 src/external/mit/xorg/server/xorg-server/Makefile.servermod
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib 2015/07/18 08:56:06 1.8
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib 2016/01/25 18:00:26 1.9
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.serverlib,v 1.8 2015/07/18 08:56:06 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.9 2016/01/25 18:00:26 christos Exp $
+.include <bsd.own.mk> # for NETBSDSRCDIR and mk.conf processing
+
# We can't use LIBISPRIVATE here as we need the ".so" installed.
MKPICINSTALL:= no
MKLINT:= no
MKDEBUGLIB:= no
MKPROFILE:= no
-.include <bsd.own.mk> # for NETBSDSRCDIR
.include <bsd.endian.mk>
.if ${TARGET_ENDIANNESS} == "1234"
--- src/external/mit/xorg/server/xorg-server/Makefile.servermod 2015/07/18 08:56:06 1.3
+++ src/external/mit/xorg/server/xorg-server/Makefile.servermod 2016/01/25 18:00:26 1.4
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.servermod,v 1.3 2015/07/18 08:56:06 mrg Exp $
+# $NetBSD: Makefile.servermod,v 1.4 2016/01/25 18:00:26 christos Exp $
+
+.include <bsd.own.mk> # For /etc/mk.conf processing
.if defined(XMODULEDIR)
SHLIB_MAJOR=0