summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-15 00:17:21 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-15 00:17:21 +0000
commit28398e91f114f1b47d51965e03e5198e30268e18 (patch)
tree3a481ead0d2091dc32c700f2edd63330c02cb1a9
parent02136ebbb54e0cda1aa928a971d8ef59a4659735 (diff)
* common.mk (.y.c): use SRC_FILE which contains slashes instead of
backslashes. [ruby-core:22891] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22964 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
-rw-r--r--common.mk2
-rw-r--r--win32/Makefile.sub2
4 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6563674569d..7111c247605 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 15 09:17:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (.y.c): use SRC_FILE which contains slashes instead of
+ backslashes. [ruby-core:22891]
+
Sun Mar 15 08:26:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (srcs-ext): creates ext/dl/callback/callback.c also.
diff --git a/Makefile.in b/Makefile.in
index 975f127b6c8..6f617c34d22 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -122,6 +122,8 @@ MANTYPE = @MANTYPE@
INSTALLED_LIST= .installed.list
MKMAIN_CMD = mkmain.sh
+
+SRC_FILE = $<
#### End of variables
all:
diff --git a/common.mk b/common.mk
index a316d1e2f59..62c755dd03a 100644
--- a/common.mk
+++ b/common.mk
@@ -435,7 +435,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 $(SRC_FILE)
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
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 37f9a8236f7..aa3bcaf55ba 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -271,6 +271,8 @@ INSTALLED_LIST= .installed.list
MKMAIN_CMD = mkmain.bat
+SRC_FILE = $(<:\=/)
+
!if !defined(WINMAINOBJ)
WINMAINOBJ = winmain.$(OBJEXT)
!endif