Module Name: src
Committed By: apb
Date: Sat Oct 10 19:05:29 UTC 2009
Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc
src/share/mk: bsd.README bsd.own.mk
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/BUILDING
cvs rdiff -u -r1.79 -r1.80 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.254 -r1.255 src/share/mk/bsd.README
cvs rdiff -u -r1.586 -r1.587 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/BUILDING
diff -u src/BUILDING:1.88 src/BUILDING:1.89
--- src/BUILDING:1.88 Sun Sep 27 18:08:24 2009
+++ src/BUILDING Sat Oct 10 19:05:28 2009
@@ -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''.
Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.79 src/doc/BUILDING.mdoc:1.80
--- src/doc/BUILDING.mdoc:1.79 Fri Oct 2 07:43:01 2009
+++ src/doc/BUILDING.mdoc Sat Oct 10 19:05:29 2009
@@ -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
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.254 src/share/mk/bsd.README:1.255
--- src/share/mk/bsd.README:1.254 Mon Oct 5 22:32:58 2009
+++ src/share/mk/bsd.README Sat Oct 10 19:05:29 2009
@@ -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]
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.586 src/share/mk/bsd.own.mk:1.587
--- src/share/mk/bsd.own.mk:1.586 Fri Oct 9 00:26:53 2009
+++ src/share/mk/bsd.own.mk Sat Oct 10 19:05:29 2009
@@ -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"
