yugui	2011-07-31 23:17:34 +0900 (Sun, 31 Jul 2011)

  New Revision: 32784

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

  Log:
    Forward-ports r32778 from branches/ruby_1_9_3 to trunk.
    --
    * lib/mkmf.rb (configuration:ECHO1): Same as the recent fix in
      common.mk.
      ":" in a make variable replacement cause a syntax error with
      /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32783)
+++ ChangeLog	(revision 32784)
@@ -1,3 +1,10 @@
+Sun Jul 31 21:19:51 2011  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* lib/mkmf.rb (configuration:ECHO1): Same as the recent fix in
+	  common.mk.
+	  ":" in a make variable replacement cause a syntax error with
+	  /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
+
 Sun Jul 31 20:39:12 2011  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* common.mk (ECHO1): nmake does not allow parenthesis in make variable
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 32783)
+++ lib/mkmf.rb	(revision 32784)
@@ -1640,7 +1640,8 @@
 V = 0
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-ECHO1 = $(V:1=@:)
+n=$(NULLCMD)
+ECHO1 = $(V:1=@$n)
 ECHO = $(ECHO1:0=@echo)
 
 #### Start of system configuration section. ####
@@ -1676,6 +1677,8 @@
   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']}
 LIBRUBY = #{CONFIG['LIBRUBY']}

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