From 9e99ce38313cda42a4e2c6c0dba8d1356eec2c7f Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Jan 2009 03:11:42 +0000
Subject: 	* 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/trunk@21516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          |  5 +++++
 win32/Makefile.sub | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9040e045c3..c6b741300b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 15 12:10:39 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
+	  miniprelude.c, newline.c): copy only when $(srcdir) != pwd.
+
 Thu Jan 15 11:40:44 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* io.c (pipe_open): revert a part of previous commit. it may be a
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index a3eef90bb3..574681bcd6 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 \
 	)
-- 
cgit v1.2.3