diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-31 14:17:42 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-31 14:17:42 +0000 |
| commit | ddeccd20f12f82d17bbf572e1ac54bac1409bc5c (patch) | |
| tree | 5b47b9c99c9df86c8f0928bafb5ee3c226327a1a | |
| parent | 4270dbe629600ac7ab72da3fecd13ba7af234a51 (diff) | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | enc/Makefile.in | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -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 diff --git a/enc/Makefile.in b/enc/Makefile.in index 3dace9fde6..203a83dbfd 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -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@ |