Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accept also ../xsrc in our sanity check, we use this as a default too, 

if it exists.
This commit is contained in:
maya 2017-10-03 10:59:04 +00:00
parent bf5991674e
commit 2f8550bbff
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.sh
View File

@ -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}
#