summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-08 11:56:33 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-08 11:56:33 +0000
commit404d6e9f38a8b7069287711bfb3431c52d363f56 (patch)
tree2aeb8018258f770ef61f5c4ee7edc4bb68016ae6
parentfd25eea0e4c1965a4e199317547ec47f4d8f1b93 (diff)
Makefile.in: revert r55303 because of an error on Solaris 10. [Bug #12471] [ruby-dev:49654]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55328 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--Makefile.in18
1 files changed, 11 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in
index 2a4d0c46f99..60fb44fd901 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -476,9 +476,10 @@ after-update:: common-srcs
update-mspec:
@$(CHDIR) $(srcdir); \
- if cd spec/mspec 2> $(NULL); then \
+ if [ -d spec/mspec ]; then \
echo updating mspec ...; \
$(Q1:0=:) set -x; \
+ cd spec/mspec && \
exec git pull; \
else \
echo retrieving mspec ...; \
@@ -489,9 +490,10 @@ update-mspec:
update-rubyspec: update-mspec
@$(CHDIR) $(srcdir); \
- if cd spec/rubyspec 2> $(NULL); then \
+ if [ -d spec/rubyspec ]; then \
echo updating rubyspec ...; \
$(Q1:0=:) set -x; \
+ cd spec/rubyspec && \
exec git pull; \
else \
echo retrieving rubyspec ...; \
@@ -501,14 +503,14 @@ update-rubyspec: update-mspec
$(Q)cd $(srcdir)/spec/rubyspec && exec git --no-pager log -1 --oneline
test-rubyspec-precheck:
- @[ -d $(srcdir)/spec/rubyspec ] || \
- { echo No rubyspec here. make update-rubyspec first.; exit 1; }
+ @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi
update-doclie:
@$(CHDIR) $(srcdir); \
- if cd coverage/doclie 2> $(NULL); then \
+ if [ -d coverage/doclie ]; then \
echo updating doclie ...; \
$(Q1:0=:) set -x; \
+ cd coverage/doclie && \
git fetch && \
exec git checkout $(DOCLIE_GIT_REF); \
else \
@@ -519,9 +521,10 @@ update-doclie:
update-simplecov-html:
@$(CHDIR) $(srcdir); \
- if cd coverage/simplecov-html 2> $(NULL) then \
+ if [ -d coverage/simplecov-html ]; then \
echo updating simplecov-html ...; \
$(Q1:0=:) set -x; \
+ cd coverage/simplecov-html && \
git fetch && \
exec git checkout $(SIMPLECOV_HTML_GIT_REF); \
else \
@@ -531,9 +534,10 @@ update-simplecov-html:
update-simplecov:
@$(CHDIR) $(srcdir); \
- if cd coverage/simplecov 2> $(NULL); then \
+ if [ -d coverage/simplecov ]; then \
echo updating simplecov ...; \
$(Q1:0=:) set -x; \
+ cd coverage/simplecov && \
git fetch && \
exec git checkout $(SIMPLECOV_GIT_REF); \
else \