mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-21 22:53:37 +00:00
autogen: Fix detection of gnulib submodule status.
Don't require a rebuild every time the common module changes status.
This commit is contained in:
@@ -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 | grep gnulib | sed 's/^[ +-]//;s/ .*//')
|
||||
if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
|
||||
: # good, it's up to date
|
||||
else
|
||||
|
||||
2
cfg.mk
2
cfg.mk
@@ -132,7 +132,7 @@ ifeq (0,$(MAKELEVEL))
|
||||
# b653eda3ac4864de205419d9f41eec267cb89eeb
|
||||
_submodule_hash = sed 's/^[ +-]//;s/ .*//'
|
||||
_update_required := $(shell \
|
||||
actual=$$(git submodule status | $(_submodule_hash)); \
|
||||
actual=$$(git submodule status | grep gnulib | $(_submodule_hash)); \
|
||||
stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)"; \
|
||||
test "$$stamp" = "$$actual"; echo $$?)
|
||||
ifeq (1,$(_update_required))
|
||||
|
||||
Reference in New Issue
Block a user