usa	2011-12-14 20:02:00 +0900 (Wed, 14 Dec 2011)

  New Revision: 34044

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

  Log:
    * common.mk,Makefile.in,win32/Makefile.sub (ECHO1): move platform
      specific hack from common.mk to Makefile.in (and win32/Makefile.sub).
      [Bug #5711]
    
    * lib/mkmf.rb: we can generate Makefile as we like.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/lib/mkmf.rb
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34043)
+++ ChangeLog	(revision 34044)
@@ -1,3 +1,11 @@
+Wed Dec 14 19:57:23 2011  NAKAMURA Usaku  <usa@r...>
+
+	* common.mk,Makefile.in,win32/Makefile.sub (ECHO1): move platform
+	  specific hack from common.mk to Makefile.in (and win32/Makefile.sub).
+	  [Bug #5711]
+
+	* lib/mkmf.rb: we can generate Makefile as we like.
+
 Wed Dec 14 19:22:33 2011  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c, include/ruby/win32.h (rb_w32_fd_is_text): new function.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 34043)
+++ lib/mkmf.rb	(revision 34044)
@@ -1705,8 +1705,7 @@
 V = 0
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-n=$(NULLCMD)
-ECHO1 = $(V:1=@$n)
+ECHO1 = $(V:1=@#{CONFIG['NULLCMD']})
 ECHO = $(ECHO1:0=@echo)
 
 #### Start of system configuration section. ####
@@ -1742,7 +1741,6 @@
     possible_command = (proc {|s| s if /top_srcdir/ !~ s} unless $extmk)
     extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " "
     mk << %{
-NULLCMD = #{CONFIG['NULLCMD']}
 
 CC = #{CONFIG['CC']}
 CXX = #{CONFIG['CXX']}
Index: common.mk
===================================================================
--- common.mk	(revision 34043)
+++ common.mk	(revision 34044)
@@ -8,8 +8,6 @@
 V = 0
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-n=$(NULLCMD)
-ECHO1 = $(V:1=@$n)
 ECHO = $(ECHO1:0=@echo)
 
 RUBYLIB       = -
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 34043)
+++ win32/Makefile.sub	(revision 34044)
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
 SHELL = $(COMSPEC)
-NULLCMD = :
+ECHO1 = $(V:1=@:)
 RUNCMD = $(COMSPEC) /c
 MKFILES = Makefile
 NULL = nul
@@ -733,6 +733,7 @@
 s,@target_cpu@,$(ARCH),;t t
 s,@target_vendor@,pc,;t t
 s,@target_os@,$(PLATFORM),;t t
+s,@NULLCMD@,:,;t t
 s,@CC@,$(CC),;t t
 s,@CPP@,$(CPP),;t t
 s,@CXX@,$$(CC),;t t
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 34043)
+++ Makefile.in	(revision 34044)
@@ -1,5 +1,7 @@
 SHELL = /bin/sh
 NULLCMD = @NULLCMD@
+n=$(NULLCMD)
+ECHO1 = $(V:1=@$n)
 RUNCMD = $(SHELL)
 CHDIR = @CHDIR@
 exec = exec

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