Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Accept also ../xsrc in our sanity check, we use this as a de...



details:   https://anonhg.NetBSD.org/src/rev/87ba1cee67fe
branches:  trunk
changeset: 826879:87ba1cee67fe
user:      maya <maya%NetBSD.org@localhost>
date:      Tue Oct 03 10:59:04 2017 +0000

description:
Accept also ../xsrc in our sanity check, we use this as a default too,
if it exists.

diffstat:

 build.sh |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r b7817c87445f -r 87ba1cee67fe build.sh
--- a/build.sh  Tue Oct 03 10:28:30 2017 +0000
+++ b/build.sh  Tue Oct 03 10:59:04 2017 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.317 2017/10/02 15:40:00 maya Exp $
+#      $NetBSD: build.sh,v 1.318 2017/10/03 10:59:04 maya Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1443,7 +1443,9 @@
        esac
 
        if [ ${MKX11-no} = "yes" ]; then
-               test -d ${X11SRCDIR-/usr/xsrc} || bomb "Asked to build X11 but no xsrc"
+               test -d ${X11SRCDIR-../xsrc} || \
+               test -d ${X11SRCDIR-/usr/xsrc} || \
+               bomb "Asked to build X11 but no xsrc"
        fi
 }
 
@@ -1898,7 +1900,7 @@
        eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.317 2017/10/02 15:40:00 maya Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.318 2017/10/03 10:59:04 maya Exp $
 # with these arguments: ${_args}
 #
 



Home | Main Index | Thread Index | Old Index