nobu	2012-03-26 14:08:55 +0900 (Mon, 26 Mar 2012)

  New Revision: 35135

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

  Log:
    * win32/Makefile.sub (newline.c, miniprelude.c): search from source
      directory, not depending on VPATH.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub

Index: common.mk
===================================================================
--- common.mk	(revision 35134)
+++ common.mk	(revision 35135)
@@ -773,9 +773,9 @@
 utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
   {$(VPATH)}oniguruma.h {$(VPATH)}missing.h
 
-newline.c: $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
-	$(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans
-newline.$(OBJEXT): {$(VPATH)}newline.c {$(VPATH)}defines.h \
+$(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
+	$(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans
+newline.$(OBJEXT): $(NEWLINE_C) {$(VPATH)}defines.h \
   {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
   {$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}subst.h
 
@@ -835,7 +835,7 @@
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
 
-miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
+$(MINIPRELUDE_C): $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
 
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 35134)
+++ win32/Makefile.sub	(revision 35135)
@@ -370,6 +370,17 @@
 rubyw: $(WPROGRAM)
 stub: $(STUBPROGRAM)
 
+!if !exist(newline.c) && exist($(srcdir)/newline.c)
+NEWLINE_C = $(srcdir)/newline.c
+!else
+NEWLINE_C = newline.c
+!endif
+!if !exist(miniprelude.c) && exist($(srcdir)/miniprelude.c)
+MINIPRELUDE_C = $(srcdir)/miniprelude.c
+!else
+MINIPRELUDE_C = miniprelude.c
+!endif
+
 !include $(srcdir)/common.mk
 
 !ifdef SCRIPTPROGRAMS
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 35134)
+++ Makefile.in	(revision 35135)
@@ -148,6 +148,9 @@
 
 MKMAIN_CMD    = mkmain.sh
 
+NEWLINE_C     = newline.c
+MINIPRELUDE_C = miniprelude.c
+
 SRC_FILE      = $<
 
 MESSAGE_BEGIN = @for line in

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