mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25584 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
6cf27fcf3b
commit
6749139822
5 changed files with 11 additions and 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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -262,6 +262,8 @@ INSTALLED_LIST= .installed.list
|
|||
|
||||
MKMAIN_CMD = mkmain.bat
|
||||
|
||||
SRC_FILE = $(<:\=/)
|
||||
|
||||
!if !defined(WINMAINOBJ)
|
||||
WINMAINOBJ = winmain.$(OBJEXT)
|
||||
!endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue