[boot] Modify the configure script to DTRT

Specifically:
- Look in build-system/ for configure.py, instead of cwd.
- After configure.py creates config.mk, move it to build-system/.

This fixes a "Failure To Configure From Source" error :-D.

1 files changed, 15 insertions, 0 deletions

diff --git a/bootstrap b/bootstrap
index 9905660..31987eb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -36,3 +36,18 @@ git submodule update --recursive
 git submodule sync
 cp build-system/taler-build-scripts/configure ./configure || true
 cp build-system/taler-build-scripts/conf/.style.yapf .style.yapf || true
+
+# The configure script looks for configure.py in the cwd
+# (but it's not there, being instead in subdir build-system/).
+# We can either modify the configure script to look in
+# the correct directory, or copy configure.py to cwd.
+# We choose to modify, but maybe that's not the best choice.
+sed -i '/^exec/s|./|build-system/|' configure
+
+# Another wrinkle is that Makefile looks in build-system/
+# for config.mk, but the configure script places it in cwd.
+# Again, we have a choice: Either modify Makefile or modify
+# the configure script to move config.mk to the right place.
+# Since we already munged the configure script once, why not again?
+sed -i '/^exec /s///' configure
+echo 'mv config.mk build-system' >> configure