nobu	2014-11-11 18:46:32 +0900 (Tue, 11 Nov 2014)

  New Revision: 48376

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

  Log:
    common.mk: nmake
    
    * common.mk (prelude.c): workaround for nmake.

  Modified files:
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 48375)
+++ common.mk	(revision 48376)
@@ -115,10 +115,10 @@ ALLOBJS       = $(NORMALMAINOBJ) $(MINIO https://github.com/ruby/ruby/blob/trunk/common.mk#L115
 GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
 
 DEFAULT_PRELUDES = $(GEM_PRELUDE)
-PRELUDE_SCRIPTS = prelude.rb enc/prelude.rb $(DEFAULT_PRELUDES)
-GEM_PRELUDE = gem_prelude.rb
-PRELUDES      = prelude.c miniprelude.c
-GOLFPRELUDES = golf_prelude.c
+PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES)
+GEM_PRELUDE   = $(srcdir)/gem_prelude.rb
+PRELUDES      = {$(srcdir)}prelude.c {$(srcdir)}miniprelude.c
+GOLFPRELUDES  = {$(srcdir)}golf_prelude.c
 
 SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
 		--extout="$(EXTOUT)" \
@@ -969,20 +969,20 @@ known_errors.inc: $(srcdir)/template/kno https://github.com/ruby/ruby/blob/trunk/common.mk#L969
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
 
-$(MINIPRELUDE_C): $(COMPILE_PRELUDE) prelude.rb
+$(MINIPRELUDE_C): $(COMPILE_PRELUDE) {$(srcdir)}prelude.rb
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -o $@ \
 		$(srcdir)/template/prelude.c.tmpl prelude.rb
 
-prelude.c: $(COMPILE_PRELUDE) $(RBCONFIG) \
-	   lib/rubygems/defaults.rb \
-	   lib/rubygems/core_ext/kernel_gem.rb \
+{$(VPATH)}prelude.c: $(COMPILE_PRELUDE) $(RBCONFIG) \
+	   {$(srcdir)}lib/rubygems/defaults.rb \
+	   {$(srcdir)}lib/rubygems/core_ext/kernel_gem.rb \
 	   $(PRELUDE_SCRIPTS) $(PREP) $(LIB_SRCS)
 	$(ECHO) generating $@
 	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
 		$(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS)
 
-golf_prelude.c: $(COMPILE_PRELUDE) $(RBCONFIG) golf_prelude.rb $(PREP)
+{$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) $(RBCONFIG) {$(srcdir)}golf_prelude.rb $(PREP)
 	$(ECHO) generating $@
 	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
 		$(srcdir)/template/prelude.c.tmpl golf_prelude.rb

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