yugui	2011-07-31 20:31:55 +0900 (Sun, 31 Jul 2011)

  New Revision: 32774

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

  Log:
    Forwardports r32772 and r32773 from branches/ruby_1_9_3 to trunk.
    * common.mk (ECHO1): ":" in a make variable replacement cause a syntax
      error with /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
    
    * configure.in (NULLCMD): new check.
    
    * Makefile.in (NULLCMD): Reflects checking in configure.
    
    * win32/Makefile.sub (NULLCMD): new assignment.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.in
    trunk/win32/Makefile.sub

Index: configure.in
===================================================================
--- configure.in	(revision 32773)
+++ configure.in	(revision 32774)
@@ -2599,6 +2599,28 @@
 	gnumake=no])
     AC_MSG_RESULT($gnumake)
 ])
+AS_IF([test "$gnumake" = yes], [ NULLCMD=: ], [
+    AC_MSG_CHECKING([for safe null command for ${Make-make}])
+    mkdir conftest.dir
+    echo 'A=1' > conftest.dir/Makefile
+    echo 'B=$(A:1=@:)' >> conftest.dir/Makefile
+    echo 'all:; $B 1 2 3 4 5 6 7 8 9' >> conftest.dir/Makefile
+    if (cd conftest.dir; ${Make-make} >/dev/null 2>/dev/null); then
+	NULLCMD=:
+    else
+	echo 'A=1' > conftest.dir/Makefile
+	echo 'B=$(A:1=@true)' >> conftest.dir/Makefile
+	echo 'all:; $B 1 2 3 4 5 6 7 8 9' >> conftest.dir/Makefile
+	if (cd conftest.dir; ${Make-make} >/dev/null 2>/dev/null); then
+	    NULLCMD=true
+	else
+	    AC_MSG_ERROR(no candidate for safe null command)
+	fi
+    fi
+    rm -fr conftest.dir
+    AC_MSG_RESULT($NULLCMD)
+])
+AC_SUBST(NULLCMD)
 
 if test "${universal_binary-no}" = yes ; then
     AC_CACHE_CHECK([for architecture macros], rb_cv_architecture_macros, [
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32773)
+++ ChangeLog	(revision 32774)
@@ -1,3 +1,14 @@
+Sun Jul 31 20:21:36 2011  "Yuki Sonoda (Yugui)"  <yugui@y...>
+
+	* common.mk (ECHO1): ":" in a make variable replacement cause a syntax
+	  error with /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
+
+	* configure.in (NULLCMD): new check.
+
+	* Makefile.in (NULLCMD): Reflects checking in configure.
+
+	* win32/Makefile.sub (NULLCMD): new assignment.
+
 Sun Jul 31 18:58:59 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_pipe): pipe on cygwin can succeed half but fail
Index: common.mk
===================================================================
--- common.mk	(revision 32773)
+++ common.mk	(revision 32774)
@@ -8,7 +8,7 @@
 V = 0
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-ECHO1 = $(V:1=@:)
+ECHO1 = $(V:1=@$(NULLCMD))
 ECHO = $(ECHO1:0=@echo)
 
 RUBYLIB       = -
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 32773)
+++ win32/Makefile.sub	(revision 32774)
@@ -1,6 +1,7 @@
 # -*- makefile -*-
 
 SHELL = $(COMSPEC)
+NULLCMD = :
 RUNCMD = $(COMSPEC) /c
 MKFILES = Makefile
 NULL = nul
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 32773)
+++ Makefile.in	(revision 32774)
@@ -1,5 +1,5 @@
 SHELL = /bin/sh
-NULLCMD = :
+NULLCMD = @NULLCMD@
 RUNCMD = $(SHELL)
 CHDIR = @CHDIR@
 exec = exec

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