diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 16:32:34 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 16:32:34 +0000 |
| commit | 9bd6042f9a859922c9d0d490eb5afc81e9cdeca3 (patch) | |
| tree | b3943ab9d57f1f9e209b7b061a23088cb1e49d37 | |
| parent | 2067adbe01b6e06b27b4c358496f72ce01092f83 (diff) | |
merges r21534 from trunk into ruby_1_9_1.
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
miniprelude.c, newline.c): shoudn't copy when $(srcdir) != ".", too.
(this is a workaround. we need more strict check.)
* win32/Makefile.sub ($(INSNS)): shound't remove BASERUBY.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | win32/Makefile.sub | 12 |
2 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Fri Jan 16 00:21:10 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc, + miniprelude.c, newline.c): shoudn't copy when $(srcdir) != ".", too. + (this is a workaround. we need more strict check.) + + * win32/Makefile.sub ($(INSNS)): shound't remove BASERUBY. + Fri Jan 16 00:19:55 2009 Koichi Sasada <ko1@atdot.net> * gc.c (gc_with_gvl): suppress warnings. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 498dec6d7..f76e2a7e4 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -768,36 +768,36 @@ ext/extinit.obj: ext/extinit.c $(SETUP) $(INSNS): @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ + if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ ) else ( \ - @$(RM) $(PROGRAM) \ + @$(RM) $(PROGRAM) & \ $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ \ ) node_name.inc: @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ + if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ ) else ( \ $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ \ ) known_errors.inc: @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ + if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ ) else ( \ $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def \ ) miniprelude.c: @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ + if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ ) else ( \ $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ \ ) newline.c: @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ + if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ ) else ( \ $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans \ ) |