[gambit-list] [PATCH 5/4(forgot it)] makefile.in: stop make update when Git fails (e.g. conflicting files)
Christian Jaeger
chrjae at gmail.com
Fri Apr 30 10:49:54 EDT 2010
NOTE: there are a couple more places in makefile.in that don't stop on
errors when they probably should. This patch only fixes those directly
related to the usage of Git.
---
makefile.in | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/makefile.in b/makefile.in
index b54c41a..9ed3c5c 100644
--- a/makefile.in
+++ b/makefile.in
@@ -143,7 +143,7 @@ push: fake_target
pull: fake_target
@if test "$(RC)" = "$(GIT)"; then \
- $(GIT) pull; \
+ $(GIT) pull && \
$(GIT) fetch --tags; \
else \
$(HG) pull; \
@@ -162,9 +162,9 @@ update-nopull: fake_target
$(HG) checkout; \
fi; \
else \
- $(RC) checkout $$next_version-bootstrap; \
- $(MAKE) bootstrap; \
- $(RC) checkout $$next_version; \
+ $(RC) checkout $$next_version-bootstrap && \
+ $(MAKE) bootstrap && \
+ $(RC) checkout $$next_version && \
$(MAKE) bootclean bootstrap update; \
fi
--
1.7.0.3
More information about the Gambit-list
mailing list