commit aa9b6a610ffe88fc714d42089fb2afa8dbc32894
parent b2c9672f2e493db810865b7de1e568a466b59360
Author: Florian Dold <florian.dold@gmail.com>
Date: Tue, 15 Oct 2019 11:57:20 +0530
allow configure.py to be simpler
Diffstat:
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
@@ -73,6 +73,14 @@ fi
# don't have python if we reach the point to fail.
PYTHON=$($python -c 'import sys; print(sys.executable)')
+scriptpath=build-system/taler-build-scripts
+
+if ! test -d "$scriptpath"; then
+ echo "fatal error: taler-build-scripts not found at $scriptpath" >&2
+ exit 1
+fi
+
+export PYTHONPATH="$scriptpath:${PYTHONPATH:-}"
# Call configure.py, assuming all went well.
# $1 is read by configure.py as the prefix.
diff --git a/configure.py.template b/configure.py.template
@@ -1,13 +1,4 @@
-import sys
-from pathlib import Path
-
-base_dir = Path(__file__, "../build-system/taler-build-scripts").resolve()
-if not base_dir.exists():
- print(
- f"build system directory ({base_dir}) missing", file=sys.stderr
- )
- sys.exit(1)
-sys.path.insert(0, str(base_dir))
+# This configure.py.template file is in the public domain.
from talerbuildconfig import *
