summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-31 13:59:04 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-31 13:59:04 +0000
commit3c20af1d3348b909a2561f97f5a1887c7a1038e3 (patch)
treee0b54a7bef89516e826700947051e109609b4ea8
parent100f2e67231ca01bfe3f51a793a3d5b91301ff7d (diff)
* 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/branches/ruby_1_9_3@32780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--enc/Makefile.in4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1759f56499..34929d3a49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 22:44:08 2011 Kazuki Tsujimoto <kazuki@callcc.net>
* configure.in: fix typos.
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@