summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-31 11:31:55 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-31 11:31:55 +0000
commit53d3b13233b96b965c84ed628142b1292422319e (patch)
treedf8923d91d527235ae5ae619b8b61bec779bf0a7 /Makefile.in
parentf46cff647e8999b09e72fb8353de6fcd0c007cc1 (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index b1864e68e3..912547860e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
SHELL = /bin/sh
-NULLCMD = :
+NULLCMD = @NULLCMD@
RUNCMD = $(SHELL)
CHDIR = @CHDIR@
exec = exec