summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorms <ms@taler.net>2021-08-09 15:45:09 +0200
committerms <ms@taler.net>2021-08-09 15:45:09 +0200
commitf5e46f4aaa445400caed6ceb714a58aa939eaa1a (patch)
tree16f401a0eba9346116c7ae2bf623320dfcb1442d
parent3e2b3133e0b6c72265d359d4c44afc02ecdff2cf (diff)
downloadbank-f5e46f4aaa445400caed6ceb714a58aa939eaa1a.tar.gz
bank-f5e46f4aaa445400caed6ceb714a58aa939eaa1a.tar.bz2
bank-f5e46f4aaa445400caed6ceb714a58aa939eaa1a.zip
Include bootstrap in the TGZ.
-rwxr-xr-xbootstrap13
-rw-r--r--build-system/Makefile2
2 files changed, 9 insertions, 6 deletions
diff --git a/bootstrap b/bootstrap
index 9ea2c21..a47322d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -5,12 +5,15 @@
set -eu
-if ! git --version >/dev/null; then
- echo "git not installed"
- exit 1
+# Skip git-commands when installing from a TGZ package.
+if [ -d .git ] ; then
+ if ! git --version >/dev/null; then
+ echo "git not installed"
+ exit 1
+ fi
+ git submodule sync
+ git submodule update --init
fi
-git submodule sync
-git submodule update --init
rm -f ./configure
cp build-system/taler-build-scripts/configure ./configure
diff --git a/build-system/Makefile b/build-system/Makefile
index 8d6d9bf..dfc8127 100644
--- a/build-system/Makefile
+++ b/build-system/Makefile
@@ -47,7 +47,7 @@ configure: build-system/taler-build-scripts/
.PHONY: dist
dist: configure
- ./build-system/taler-build-scripts/archive-with-submodules/git_archive_all.py --include ./configure taler-bank-$(version).tar.gz
+ ./build-system/taler-build-scripts/archive-with-submodules/git_archive_all.py --include ./bootstrap --include ./configure taler-bank-$(version).tar.gz
.PHONY: pretty
pretty: poetry-install