Permalink
Browse files

Forward-ports r32780 from branches/ruby_1_9_3 to trunk.

--
* enc/Makefile.in (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@32787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 4270dbe commit ddeccd20f12f82d17bbf572e1ac54bac1409bc5c @yugui yugui committed Jul 31, 2011
Showing with 9 additions and 1 deletion.
  1. +6 −0 ChangeLog
  2. +3 −1 enc/Makefile.in
View
@@ -1,3 +1,9 @@
+Sun Jul 31 22:57:16 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * enc/Makefile.in (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 21:16:02 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* complex.c (f_signbit): gcc4 on Solaris DOES have signbit but does
View
@@ -1,7 +1,8 @@
V = 0
Q1 = $(V:1=)
Q = $(Q1:0=@)
-ECHO1 = $(V:1=@:)
+n=$(NULLCMD)
+ECHO1 = $(V:1=@$n)
ECHO = $(ECHO1:0=@echo)
encsrcdir = @srcdir@
@@ -53,6 +54,7 @@ RUBY = $(MINIRUBY)
WORKDIRS = @WORKDIRS@
+NULLCMD = @NULLCMD@
RM = @RM@
RMDIR = @RMDIR@
RMDIRS = @RMDIRS@

0 comments on commit ddeccd2

Please sign in to comment.