yugui	2009-10-31 22:01:51 +0900 (Sat, 31 Oct 2009)

  New Revision: 25584

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25584

  Log:
    merges r22964 from trunk into ruby_1_9_1.
    --
    * common.mk (.y.c): use SRC_FILE which contains slashes instead of
      backslashes.  [ruby-core:22891]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/Makefile.in
    branches/ruby_1_9_1/common.mk
    branches/ruby_1_9_1/version.h
    branches/ruby_1_9_1/win32/Makefile.sub

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25583)
+++ ruby_1_9_1/ChangeLog	(revision 25584)
@@ -1,3 +1,8 @@
+Sun Mar 15 09:17:26 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (.y.c): use SRC_FILE which contains slashes instead of
+	  backslashes.  [ruby-core:22891]
+
 Tue Sep  1 19:56:28 2009  Koichi Sasada  <ko1@a...>
 
 	* vm_eval.c (eval_string_with_cref): fix to check local_table_size.
Index: ruby_1_9_1/common.mk
===================================================================
--- ruby_1_9_1/common.mk	(revision 25583)
+++ ruby_1_9_1/common.mk	(revision 25584)
@@ -422,7 +422,7 @@
 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
Index: ruby_1_9_1/win32/Makefile.sub
===================================================================
--- ruby_1_9_1/win32/Makefile.sub	(revision 25583)
+++ ruby_1_9_1/win32/Makefile.sub	(revision 25584)
@@ -262,6 +262,8 @@
 
 MKMAIN_CMD    = mkmain.bat
 
+SRC_FILE = $(<:\=/)
+
 !if !defined(WINMAINOBJ)
 WINMAINOBJ    = winmain.$(OBJEXT)
 !endif
Index: ruby_1_9_1/Makefile.in
===================================================================
--- ruby_1_9_1/Makefile.in	(revision 25583)
+++ ruby_1_9_1/Makefile.in	(revision 25584)
@@ -121,6 +121,8 @@
 INSTALLED_LIST= .installed.list
 
 MKMAIN_CMD    = mkmain.sh
+
+SRC_FILE      = $<
 #### End of variables
 
 all:
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25583)
+++ ruby_1_9_1/version.h	(revision 25584)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 310
+#define RUBY_PATCHLEVEL 311
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/