1 files changed, 18 insertions, 5 deletions

diff --git a/configure b/configure
index 5a14890b..ad724ccb 100755
--- a/configure
+++ b/configure
@@ -20,14 +20,29 @@
 # This script checks if a suitable python3 executable is installed and then
 # executes the actual configure logic written in Python.
 
-scriptpath=build-system/taler-build-scripts
+build_system_dir=build-system
 
-if ! test -d "$scriptpath"; then
-  echo "fatal error: taler-build-scripts not found at $scriptpath" >&2
+if ! test -d "$build_system_dir"; then
+  # Maybe this is not a top-level configure invocation
+  # For monorepos, try location from top-level
+  build_system_dir=../../build-system
+fi
+
+if ! test -d "$build_system_dir"; then
+  echo "fatal error: build-system directory not found" >&2
+  echo "hint: are you running this script from the right directory?" >&2
+  exit 1
+fi
+
+scriptpath=$build_system_dir/taler-build-scripts
+if ! test -d "$build_system_dir"; then
+  echo "fatal error: taler-build-scripts directory not found at $scriptpath" >&2
   echo "hint: did you run './bootstrap'?" >&2
   exit 1
 fi
 
+export TALERBUILDSYSTEMDIR=$build_system_dir
+
 # Check that the python3 executable is on the PATH.
 # This follows PEP 394 (https://www.python.org/dev/peps/pep-0394/).
 if ! python3 --version >/dev/null 2>&1; then
@@ -41,7 +56,5 @@ python3 "$scriptpath/pyvercheck.py" || exit $?
 # Allow Python to find libraries that are checked into the build system git.
 export PYTHONPATH="$scriptpath:${PYTHONPATH:-}"
 
-export TALERBUILDSYSTEMDIR=./build-system
-
 # Call configure.py, assuming all went well.
 python3 $TALERBUILDSYSTEMDIR/configure.py "$@"