diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-31 13:01:51 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-31 13:01:51 +0000 |
| commit | ef34e7707dbbfd8cb2ac873ff2df68202c3eb5dc (patch) | |
| tree | 9ec257f6c792b277ae3e1467f56b7da68d494017 | |
| parent | acdd2dbaf3ea8958d480ecd7af7d2ede2d47087d (diff) | |
| download | ruby-ef34e7707dbbfd8cb2ac873ff2df68202c3eb5dc.tar.gz ruby-ef34e7707dbbfd8cb2ac873ff2df68202c3eb5dc.tar.xz ruby-ef34e7707dbbfd8cb2ac873ff2df68202c3eb5dc.zip | |
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]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25584 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
5 files changed, 11 insertions, 2 deletions
@@ -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] + Tue Sep 1 19:56:28 2009 Koichi Sasada <ko1@atdot.net> * vm_eval.c (eval_string_with_cref): fix to check local_table_size. diff --git a/Makefile.in b/Makefile.in index 698fb4ac9..9f6bb7b29 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: @@ -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 @@ -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 064511adf..1963290aa 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 |