usa	2009-01-16 12:38:58 +0900 (Fri, 16 Jan 2009)

  New Revision: 21591

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21591

  Log:
    * 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).

  Modified files:
    trunk/ChangeLog
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21590)
+++ ChangeLog	(revision 21591)
@@ -1,3 +1,12 @@
+Fri Jan 16 12:27:50 2009  NAKAMURA Usaku  <usa@r...>
+
+	* 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).
+
 Fri Jan 16 12:15:07 2009  NAKAMURA Usaku  <usa@r...>
 
 	* include/ruby/ruby.h (PRI_PTRDIFF_PREFIX): must define as string.
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 21590)
+++ win32/Makefile.sub	(revision 21591)
@@ -771,37 +771,22 @@
 	$(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) $@

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/