From f037909aed0e554b8c53fe7cde258f8ff95047b1 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 31 Jul 2011 14:17:31 +0000 Subject: [PATCH] Forward-ports r32775 from branches/ruby_1_9_3 to trunk. -- * common.mk (ECHO1): nmake does not allow parenthesis in make variable replacement. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ common.mk | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5cde81fb08..ffa10d8af9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jul 31 20:39:12 2011 Yuki Sonoda (Yugui) + + * common.mk (ECHO1): nmake does not allow parenthesis in make variable + replacement. + Sun Jul 31 23:06:57 2011 Kazuki Tsujimoto * vm.c (check_env): print debug messages to stderr. diff --git a/common.mk b/common.mk index 489bf6d23a..67cada076c 100644 --- a/common.mk +++ b/common.mk @@ -8,7 +8,8 @@ dll: $(LIBRUBY_SO) V = 0 Q1 = $(V:1=) Q = $(Q1:0=@) -ECHO1 = $(V:1=@$(NULLCMD)) +n=$(NULLCMD) +ECHO1 = $(V:1=@$n) ECHO = $(ECHO1:0=@echo) RUBYLIB = -