nobu	2014-12-01 17:20:45 +0900 (Mon, 01 Dec 2014)

  New Revision: 48664

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

  Log:
    common.mk: rebuild verconf.h for each configure
    
    * win32/Makefile.sub (verconf.h): so depends on verconf.mk, which
      is rebuilt by setup.mak.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48663)
+++ ChangeLog	(revision 48664)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Dec  1 17:20:42 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/Makefile.sub (verconf.h): so depends on verconf.mk, which
+	  is rebuilt by setup.mak.
+
 Mon Dec  1 11:05:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* proc.c: fix grammar by @BenMorganIO [fix GH-764][ci skip]
Index: common.mk
===================================================================
--- common.mk	(revision 48663)
+++ common.mk	(revision 48664)
@@ -677,9 +677,9 @@ $(NEWLINE_C): $(srcdir)/enc/trans/newlin https://github.com/ruby/ruby/blob/trunk/common.mk#L677
 	$(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans
 newline.$(OBJEXT): $(NEWLINE_C)
 
-verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
+verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb
 	$(ECHO) creating $@
-	$(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" -c -o $@ $(srcdir)/template/verconf.h.tmpl
+	$(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl
 
 DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
 		eval.$(OBJEXT) \
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 48663)
+++ win32/Makefile.sub	(revision 48664)
@@ -1166,6 +1166,8 @@ INSNS	= opt_sc.inc optinsn.inc optunifs. https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1166
 ! endif
 !endif
 
+verconf.h: verconf.mk
+
 loadpath: verconf.h
 	@$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \
 	sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 48663)
+++ Makefile.in	(revision 48664)
@@ -488,6 +488,8 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h https://github.com/ruby/ruby/blob/trunk/Makefile.in#L488
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
 
+verconf.h: $(RBCONFIG)
+
 loadpath: verconf.h
 	@$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \
 	sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \

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