summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-04 09:20:30 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-04 09:20:30 +0000
commit9100a770fb1bfc5be1496d36ecd424d607a56234 (patch)
treea112df50f4e8e99e455ee2ed277994819e3d321c
parent375d08ea17d01c14f77c0d069b99c352fdaa8e73 (diff)
merges r22691 from trunk into ruby_1_9_1.
-- * common.mk (.y.c): removed extra backslash. [ruby-core:22602] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--common.mk2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fd898eb74b..34d70a8a9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 1 19:10:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (.y.c): removed extra backslash. [ruby-core:22602]
+
Sun Mar 1 19:02:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dl/cfunc.c (rb_dlcfunc_call): fix for stdcall and missing
diff --git a/common.mk b/common.mk
index 552bb1954c..1cc16ee501 100644
--- a/common.mk
+++ b/common.mk
@@ -422,7 +422,7 @@ PHONY:
parse.h {$(VPATH)}parse.h: {$(VPATH)}parse.c
{$(srcdir)}.y.c:
- $(YACC) -d $(YFLAGS) -o y.tab.c $(<:\\=/)
+ $(YACC) -d $(YFLAGS) -o y.tab.c $(<:\=/)
sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
@$(MV) $@.new $@
sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse\.y/d" y.tab.h > $(@:.c=.h).new