nobu	2013-01-10 17:45:42 +0900 (Thu, 10 Jan 2013)

  New Revision: 38764

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38764

  Log:
    Makefile.in: continue if Makefile unchanged
    
    * Makefile.in, win32/Makefile.sub ($(MKFILES)): continue if Makefile
      unchanged.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38763)
+++ ChangeLog	(revision 38764)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Jan 10 17:45:39 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in, win32/Makefile.sub ($(MKFILES)): continue if Makefile
+	  unchanged.
+
 Thu Jan 10 16:31:20 2013  Shugo Maeda  <shugo@r...>
 
 	* vm_insnhelper.c (vm_search_super_method): raise a TypeError
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 38763)
+++ win32/Makefile.sub	(revision 38764)
@@ -448,8 +448,8 @@ test-rubyspec-precheck: https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L448
 
 $(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
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 38763)
+++ Makefile.in	(revision 38764)
@@ -251,8 +251,10 @@ install-cross: $(arch)-fake.rb $(RBCONFI https://github.com/ruby/ruby/blob/trunk/Makefile.in#L251
 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:"; \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/