diff --git a/ChangeLog b/ChangeLog index ead886b157..3f977f2a68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 15 09:17:26 2009 Nobuyoshi Nakada + + * 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 * vm_eval.c (eval_string_with_cref): fix to check local_table_size. diff --git a/Makefile.in b/Makefile.in index 698fb4ac9c..9f6bb7b290 100644 --- a/Makefile.in +++ b/Makefile.in @@ -121,6 +121,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 2d9f59f152..0345274e10 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 $(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/version.h b/version.h index 260fdbd0ec..1d8edee6da 100644 --- a/version.h +++ b/version.h @@ -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 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 064511adf9..1963290aad 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -262,6 +262,8 @@ INSTALLED_LIST= .installed.list MKMAIN_CMD = mkmain.bat +SRC_FILE = $(<:\=/) + !if !defined(WINMAINOBJ) WINMAINOBJ = winmain.$(OBJEXT) !endif