summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-10 08:45:42 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-10 08:45:42 +0000
commit1a920c7f9b05c57070add324899dae5b4562b963 (patch)
treecfbede3bae59e93eb80036b957a17adeb5aff9ac
parentb7b183f682672de2e4e468e84fa865e7c1520ef8 (diff)
Makefile.in: continue if Makefile unchanged
* Makefile.in, win32/Makefile.sub ($(MKFILES)): continue if Makefile unchanged. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in4
-rw-r--r--win32/Makefile.sub4
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f225fcc..c3a3ab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 10 17:45:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in, win32/Makefile.sub ($(MKFILES)): continue if Makefile
+ unchanged.
+
Thu Jan 10 16:31:20 2013 Shugo Maeda <shugo@ruby-lang.org>
* vm_insnhelper.c (vm_search_super_method): raise a TypeError
diff --git a/Makefile.in b/Makefile.in
index e689762..45eb7c6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -251,8 +251,10 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/confi
Makefile: $(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
$(MKFILES): config.status
+ @[ -f Makefile ] && mv Makefile Makefile.old
MAKE=$(MAKE) $(SHELL) ./config.status
- @{ \
+ @cmp Makefile Makefile.old > /dev/null 2>&1 && echo Makefile unchanged && exit 0; \
+ { \
echo "all:; -@rm -f conftest.mk"; \
echo "conftest.mk: .force; @echo AUTO_REMAKE"; \
echo ".force:"; \
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 3f62197..651f54a 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -448,8 +448,8 @@ test-rubyspec-precheck:
$(MKFILES): $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/common.mk $(srcdir)/enc/Makefile.in
$(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args)
- @echo $(MKFILES) should be updated, re-run $(MAKE).
- @exit 1
+ @fc Makefile Makefile.old > nul && echo Makefile unchanged || \
+ (echo $(MKFILES) was updated, re-run $(MAKE). & exit 1)
RUBY_CONFIG_H = $(arch_hdrdir)/ruby/config.h
CONFIG_H = ./.config.h.time