nobu	2014-11-11 19:29:00 +0900 (Tue, 11 Nov 2014)

  New Revision: 48378

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

  Log:
    * win32/Makefile.sub (prelude.c): search from source directory,
      not depending on VPATH, in parallel to r35135.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub
Index: common.mk
===================================================================
--- common.mk	(revision 48377)
+++ common.mk	(revision 48378)
@@ -974,7 +974,7 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) {$( https://github.com/ruby/ruby/blob/trunk/common.mk#L974
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -o $@ \
 		$(srcdir)/template/prelude.c.tmpl prelude.rb
 
-{$(VPATH)}prelude.c: $(COMPILE_PRELUDE) $(RBCONFIG) \
+$(PRELUDE_C): $(COMPILE_PRELUDE) $(RBCONFIG) \
 	   {$(srcdir)}lib/rubygems/defaults.rb \
 	   {$(srcdir)}lib/rubygems/core_ext/kernel_gem.rb \
 	   $(PRELUDE_SCRIPTS) $(PREP) $(LIB_SRCS)
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 48377)
+++ win32/Makefile.sub	(revision 48378)
@@ -403,6 +403,11 @@ MINIPRELUDE_C = $(srcdir)/miniprelude.c https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L403
 !else
 MINIPRELUDE_C = miniprelude.c
 !endif
+!if !exist(prelude.c) && exist($(srcdir)/prelude.c)
+PRELUDE_C = $(srcdir)/prelude.c
+!else
+PRELUDE_C = prelude.c
+!endif
 RBCONFIG      = ./.rbconfig.time
 
 !include $(srcdir)/common.mk
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 48377)
+++ Makefile.in	(revision 48378)
@@ -173,6 +173,7 @@ INSTALLED_LIST= .installed.list https://github.com/ruby/ruby/blob/trunk/Makefile.in#L173
 
 NEWLINE_C     = newline.c
 MINIPRELUDE_C = miniprelude.c
+PRELUDE_C     = prelude.c
 RBCONFIG      = .rbconfig.time
 
 SRC_FILE      = $<

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