merges r21516 from trunk into ruby_1_9_1.

	* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
	  miniprelude.c, newline.c): copy only when $(srcdir) != pwd.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 6 deletions

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e0d8933e2d..124b438f64 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -768,7 +768,7 @@ ext/extinit.obj: ext/extinit.c $(SETUP)
 
 $(INSNS):
 	@if exist $(srcdir:/=\)\$(@F) ( \
-	copy $(srcdir:/=\)\$(@F) $@ \
+	if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
 	) else ( \
 	@$(RM) $(PROGRAM) \
 	$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ \
@@ -776,28 +776,28 @@ $(INSNS):
 
 node_name.inc:
 	@if exist $(srcdir:/=\)\$(@F) ( \
-	copy $(srcdir:/=\)\$(@F) $@ \
+	if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
 	) else ( \
 	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ \
 	)
 
 known_errors.inc:
 	@if exist $(srcdir:/=\)\$(@F) ( \
-	copy $(srcdir:/=\)\$(@F) $@ \
+	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) ( \
-	copy $(srcdir:/=\)\$(@F) $@ \
+	if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
 	) else ( \
 	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ \
 	)
 
-newline.c: 
+newline.c:
 	@if exist $(srcdir:/=\)\$(@F) ( \
-	copy $(srcdir:/=\)\$(@F) $@ \
+	if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
 	) else ( \
 	$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans \
 	)