From 2dafa21892b5e75ef64031811d0b6138acf85aa1 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 31 Jul 2011 14:17:34 +0000
Subject: 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 7 +++++++
 lib/mkmf.rb | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ffa10d8af9..922ba8451c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jul 31 21:19:51 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* 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@yugui.jp>
 
 	* common.mk (ECHO1): nmake does not allow parenthesis in make variable
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 9b0b8c7872..85666ec004 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1640,7 +1640,8 @@ SHELL = /bin/sh
 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 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
   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']}
-- 
cgit v1.2.3