From c68fdad4736be4b1281dda9e8563bc9c4aacf344 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 16 Jan 2009 03:38:58 +0000
Subject: 	* win32/Makefile.sub ($(INSNS), node_name.inc,
 known_errors.inc, 	  miniprelude.c, newline.c): if dependencies is newer
 than targets or 	  targets don't exist, try to create targets with
 BASERUBY. no need to 	  detect errors there because the absence of BASERUBY
 is not abnormal. 	  after the try, if the targets still don't exist,
 copy them from 	  $(srcdir).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/Makefile.sub | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

(limited to 'win32')

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index dc2baf6483..f5acdeb92e 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -771,37 +771,22 @@ ext/extinit.obj: ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 
 $(INSNS):
-	@if exist $(srcdir:/=\)\$(@F) ( \
-	if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
-	) else ( \
-	@$(RM) $(PROGRAM) & \
-	$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ \
-	)
+	@$(RM) $(PROGRAM)
+	-$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
+	if not exist $@ copy $(srcdir:/=\)\$(@F) $@
 
 node_name.inc:
-	@if exist $(srcdir:/=\)\$(@F) ( \
-	if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
-	) else ( \
-	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ \
-	)
+	-$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
+	if not exist $@ copy $(srcdir:/=\)\$(@F) $@
 
 known_errors.inc:
-	@if exist $(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 \
-	)
+	-$(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
+	if not exist $@ copy $(srcdir:/=\)\$(@F) $@
 
 miniprelude.c:
-	@if exist $(srcdir:/=\)\$(@F) ( \
-	if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
-	) else ( \
-	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ \
-	)
+	-$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
+	if not exist $@ copy $(srcdir:/=\)\$(@F) $@
 
 newline.c:
-	@if exist $(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 \
-	)
+	-$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans
+	if not exist $@ copy $(srcdir:/=\)\$(@F) $@
-- 
cgit v1.2.3