summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--defs/gmake.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk
index a6794fa596..af8c8a651f 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -139,6 +139,7 @@ else ifeq ($(VCS),svn)
VCSCOMMIT = $(VCS) commit $(SVNCOMMITOPTIONS)
else ifeq ($(VCS),git svn)
VCSCOMMIT = $(VCS) dcommit $(GITSVNCOMMITOPTIONS)
+VCSWAIT = sleep 2 # wait for svn to git sync
else ifeq ($(VCS),git)
VCSCOMMIT := $(VCS) push $(GITCOMMITOPTIONS)
endif
@@ -146,4 +147,6 @@ ifneq ($(VCSCOMMIT),)
.PHONY: commit
commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS)))
@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSCOMMIT)
+ $(Q)$(VCSWAIT)
+ $(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY update-src srcs all-incs
endif