[src/trunk]: src/external/mit/xorg/server/xorg-server Include <bsd.own.mk> be...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/539766c29f10
branches:  trunk
changeset: 813370:539766c29f10
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jan 25 18:00:26 2016 +0000

description:
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.

diffstat:

 external/mit/xorg/server/xorg-server/Makefile.serverlib |  5 +++--
 external/mit/xorg/server/xorg-server/Makefile.servermod |  4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 5dc89ecae11e -r 539766c29f10 external/mit/xorg/server/xorg-server/Makefile.serverlib
--- a/external/mit/xorg/server/xorg-server/Makefile.serverlib   Mon Jan 25 17:59:35 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.serverlib   Mon Jan 25 18:00:26 2016 +0000
@@ -1,4 +1,6 @@
-#      $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
@@ -6,7 +8,6 @@
 MKDEBUGLIB:=   no
 MKPROFILE:=    no
 
-.include <bsd.own.mk>          # for NETBSDSRCDIR
 .include <bsd.endian.mk>
 
 .if ${TARGET_ENDIANNESS} == "1234"
diff -r 5dc89ecae11e -r 539766c29f10 external/mit/xorg/server/xorg-server/Makefile.servermod
--- a/external/mit/xorg/server/xorg-server/Makefile.servermod   Mon Jan 25 17:59:35 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.servermod   Mon Jan 25 18:00:26 2016 +0000
@@ -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