Module Name: src
Committed By: maya
Date: Tue Oct 3 10:59:04 UTC 2017
Modified Files:
src: build.sh
Log Message:
Accept also ../xsrc in our sanity check, we use this as a default too,
if it exists.
To generate a diff of this commit:
cvs rdiff -u -r1.317 -r1.318 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.317 src/build.sh:1.318
--- src/build.sh:1.317 Mon Oct 2 15:40:00 2017
+++ src/build.sh Tue Oct 3 10:59:04 2017
@@ -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 @@ sanitycheck()
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 @@ createmakewrapper()
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}
#
