[src/trunk]: src If ${NETBDSRCDIR}/../xsrc exists, then use it as the default...

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

details:   https://anonhg.NetBSD.org/src/rev/894e7cc1b63e
branches:  trunk
changeset: 748032:894e7cc1b63e
user:      apb <apb%NetBSD.org@localhost>
date:      Sat Oct 10 19:05:28 2009 +0000

description:
If ${NETBDSRCDIR}/../xsrc exists, then use it as the default value
of X11SRCDIR.  If it doesn't exist, then use /usr/xsrc as before.

OK mrg

diffstat:

 BUILDING            |   3 ++-
 doc/BUILDING.mdoc   |   6 ++++--
 share/mk/bsd.README |   5 +++--
 share/mk/bsd.own.mk |  11 +++++++++--
 4 files changed, 18 insertions(+), 7 deletions(-)

diffs (77 lines):

diff -r 9f473fce77fa -r 894e7cc1b63e BUILDING
--- a/BUILDING  Sat Oct 10 18:06:53 2009 +0000
+++ b/BUILDING  Sat Oct 10 19:05:28 2009 +0000
@@ -372,7 +372,8 @@
                  an absolute path.  The main X11R6 source is found in
                  X11SRCDIR/xfree/xc.
 
-                 Default: ``/usr/xsrc''
+                 Default: NETBSDRCDIR/../xsrc, if that exists; otherwise
+                 /usr/xsrc.
 
      X11FLAVOUR  The style of X11 cross-built, set to either ``Xorg'' or
                  ``XFree86''.
diff -r 9f473fce77fa -r 894e7cc1b63e doc/BUILDING.mdoc
--- a/doc/BUILDING.mdoc Sat Oct 10 18:06:53 2009 +0000
+++ b/doc/BUILDING.mdoc Sat Oct 10 19:05:28 2009 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: BUILDING.mdoc,v 1.79 2009/10/02 07:43:01 cegger Exp $
+.\"    $NetBSD: BUILDING.mdoc,v 1.80 2009/10/10 19:05:29 apb Exp $
 .\"
 .\" Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -669,7 +669,9 @@
 The main X11R6 source is found in
 .Sy X11SRCDIR Ns Pa /xfree/xc .
 .DFLT
-.Dq /usr/xsrc
+.Sy NETBSDRCDIR Ns Pa /../xsrc ,
+if that exists; otherwise
+.Pa /usr/xsrc .
 .
 .It Sy X11FLAVOUR
 The style of X11 cross-built, set to either
diff -r 9f473fce77fa -r 894e7cc1b63e share/mk/bsd.README
--- a/share/mk/bsd.README       Sat Oct 10 18:06:53 2009 +0000
+++ b/share/mk/bsd.README       Sat Oct 10 19:05:28 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.254 2009/10/05 22:32:58 haad Exp $
+#      $NetBSD: bsd.README,v 1.255 2009/10/10 19:05:29 apb Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -510,7 +510,8 @@
 
 NLSMODE                Native Language Support files mode.  [${NONBINMODE}]
 
-X11SRCDIR      The path to the xsrc tree.  [/usr/xsrc]
+X11SRCDIR      The path to the xsrc tree.  [${NETBSDSRCDIR}/../xsrc,
+               if that exists; otherwise /usr/xsrc]
 
 X11SRCDIR.xc   The path to the (old) X11 xc src tree.  [${X11SRCDIR}/xfree/xc]
 
diff -r 9f473fce77fa -r 894e7cc1b63e share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat Oct 10 18:06:53 2009 +0000
+++ b/share/mk/bsd.own.mk       Sat Oct 10 19:05:28 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.586 2009/10/09 00:26:53 haad Exp $
+#      $NetBSD: bsd.own.mk,v 1.587 2009/10/10 19:05:29 apb Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -850,7 +850,14 @@
 #
 # Where X11 sources are and where it is installed to.
 #
-X11SRCDIR?=            /usr/xsrc
+.if !defined(X11SRCDIR)
+.if exists(${NETBSDSRCDIR}/../xsrc)
+X11SRCDIR!=            cd ${NETBSDSRCDIR}/../xsrc && pwd
+.else
+X11SRCDIR=             /usr/xsrc
+.endif
+.endif # !defined(X11SRCDIR)
+
 X11SRCDIR.xc?=         ${X11SRCDIR}/xfree/xc
 X11SRCDIR.local?=      ${X11SRCDIR}/local
 .if ${X11FLAVOUR} == "Xorg"