aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-12-01 13:27:23 +0000
committerng0 <ng0@n0.is>2019-12-01 13:27:23 +0000
commit1f7e6f40f9ba31b2fbe929b99c62e30b83ead7c4 (patch)
treec0029c0e4ac32612a6c3e53786c37afd81ccb61c
parentd03f98d602a4b10991b705ceb74bfbd5c8572904 (diff)
downloadwww-1f7e6f40f9ba31b2fbe929b99c62e30b83ead7c4.tar.gz
www-1f7e6f40f9ba31b2fbe929b99c62e30b83ead7c4.zip
revert the reverting of submodule commits + add more commands to bootstrap for
this.
-rwxr-xr-xbootstrap2
m---------build-system/taler-build-scripts0
-rwxr-xr-xconfigure1
m---------inc0
4 files changed, 2 insertions, 1 deletions
diff --git a/bootstrap b/bootstrap
index 7fa915ff..7630c337 100755
--- a/bootstrap
+++ b/bootstrap
@@ -11,5 +11,7 @@ if ! git --version >/dev/null; then
11fi 11fi
12 12
13git submodule update --init 13git submodule update --init
14git submodule update --recursive --remote
15git submodule sync
14cp build-system/taler-build-scripts/configure ./configure || true 16cp build-system/taler-build-scripts/configure ./configure || true
15cp build-system/taler-build-scripts/conf/.style.yapf .style.yapf || true 17cp build-system/taler-build-scripts/conf/.style.yapf .style.yapf || true
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
Subproject 323c6a9412a78dd6a3341a05746fca4b3a57492 Subproject 1915a74bbb4cd2ae9bc541a382dfebc37064a2f
diff --git a/configure b/configure
index e2be5fac..7749566c 100755
--- a/configure
+++ b/configure
@@ -32,7 +32,6 @@
32 32
33# we invoke configure not as a symlink but as a copy, 33# we invoke configure not as a symlink but as a copy,
34# so we have to use a fixed location for the repository! 34# so we have to use a fixed location for the repository!
35# dir=$(dirname "$(readlink -f -- "$0")")/build-system/taler-build-scripts
36dir=$(dirname "$(readlink -- "$0")")/build-system/taler-build-scripts 35dir=$(dirname "$(readlink -- "$0")")/build-system/taler-build-scripts
37. $dir/sh/lib.sh/existence.sh 36. $dir/sh/lib.sh/existence.sh
38. $dir/sh/lib.sh/existence_python.sh 37. $dir/sh/lib.sh/existence_python.sh
diff --git a/inc b/inc
Subproject 20373c170a50c50380a72a04ef1beb4e715efb7 Subproject 1dc65315af4dbe083b222995944245ab7272329