From a9cd6cc0a17a5974d0b15936b6e2789fcf403142 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 15 Jan 2009 15:23:59 +0000 Subject: * 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@21534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ win32/Makefile.sub | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9e5ba7e5e..7f5bb914b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Jan 16 00:21:10 2009 NAKAMURA Usaku + + * 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 * gc.c (gc_with_gvl): suppress warnings. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 498dec6d72..f76e2a7e45 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 \ ) -- cgit v1.2.3