summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authormaya <maya@NetBSD.org>2017-10-03 10:59:04 +0000
committermaya <maya@NetBSD.org>2017-10-03 10:59:04 +0000
commit02868e5da9e105a59dcc82d056c75f361ce957c9 (patch)
tree96492422748f09736c412a491499b532545873ee /build.sh
parentae85de3c70a236c40eb0dc7bbb428e7482c021fc (diff)
Accept also ../xsrc in our sanity check, we use this as a default too,
if it exists.
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 126739a0698..feda5363275 100755
--- a/build.sh
+++ b/build.sh
@@ -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}
#