summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 16:32:34 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 16:32:34 +0000
commitf6edc70d56f72232bee465d0699d36af2c85192d (patch)
treeb3943ab9d57f1f9e209b7b061a23088cb1e49d37 /win32
parentfb117753c5d5110e1c669c7bd8c6e5ef0efb57b8 (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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub12
1 files changed, 6 insertions, 6 deletions
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 \
)