yugui	2009-01-16 01:32:34 +0900 (Fri, 16 Jan 2009)

  New Revision: 21572

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

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

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/win32/Makefile.sub

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21571)
+++ ruby_1_9_1/ChangeLog	(revision 21572)
@@ -1,3 +1,11 @@
+Fri Jan 16 00:21:10 2009  NAKAMURA Usaku  <usa@r...>
+
+	* 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.
+
 Fri Jan 16 00:19:55 2009  Koichi Sasada  <ko1@a...>
 
 	* gc.c (gc_with_gvl): suppress warnings.
Index: ruby_1_9_1/win32/Makefile.sub
===================================================================
--- ruby_1_9_1/win32/Makefile.sub	(revision 21571)
+++ ruby_1_9_1/win32/Makefile.sub	(revision 21572)
@@ -768,36 +768,36 @@
 
 $(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 \
 	)

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