Module Name: src
Committed By: christos
Date: Mon Jan 25 18:00:26 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.serverlib
Makefile.servermod
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/Makefile.servermod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.8 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.9
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.8 Sat Jul 18 04:56:06 2015
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Mon Jan 25 13:00:26 2016
@@ -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 @@ MKLINT:= no
MKDEBUGLIB:= no
MKPROFILE:= no
-.include <bsd.own.mk> # for NETBSDSRCDIR
.include <bsd.endian.mk>
.if ${TARGET_ENDIANNESS} == "1234"
Index: src/external/mit/xorg/server/xorg-server/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.3 src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.4
--- src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.3 Sat Jul 18 04:56:06 2015
+++ src/external/mit/xorg/server/xorg-server/Makefile.servermod Mon Jan 25 13:00:26 2016
@@ -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
