summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xautogen.sh2
-rw-r--r--cfg.mk4
2 files changed, 4 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh
index cbb6da89..166ca56e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ set -v
# Ensure that whenever we pull in a gnulib update or otherwise change to a
# different version (i.e., when switching branches), we also rerun ./bootstrap.
curr_status=.git-module-status
-t=$(git submodule status|sed 's/.//;s/ .*//')
+t=$(git submodule status|sed 's/^[ -]//;s/ .*//')
if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
: # good, it's up to date
else
diff --git a/cfg.mk b/cfg.mk
index 0c19cc9f..8811d0d0 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -132,7 +132,9 @@ ifeq (0,$(MAKELEVEL))
# submodule name. Contrast these:
# -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib
# b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
- _submodule_hash = sed 's/.//;s/ .*//'
+ # $ cat .git-module-status
+ # b653eda3ac4864de205419d9f41eec267cb89eeb
+ _submodule_hash = sed 's/^[ -]//;s/ .*//'
_update_required := $(shell \
actual=$$(git submodule status | $(_submodule_hash)); \
stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)"; \