nobu	2013-05-16 01:44:55 +0900 (Thu, 16 May 2013)

  New Revision: 40770

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

  Log:
    common.mk, Makefile.sub: fix build failure on mswin
    
    * common.mk (verconf.h): $< cannot be used in explicit rules with
      nmake.
    * win32/Makefile.sub (CONFIG_H): create verconf.in instead of
      verconf.h.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40769)
+++ ChangeLog	(revision 40770)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu May 16 01:44:45 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (verconf.h): $< cannot be used in explicit rules with
+	  nmake.
+
+	* win32/Makefile.sub (CONFIG_H): create verconf.in instead of
+	  verconf.h.
+
 Thu May 16 01:25:07 2013  Aaron Patterson <aaron@t...>
 
 	* ext/psych/lib/psych/visitors/yaml_tree.rb: only emit warnings when
Index: common.mk
===================================================================
--- common.mk	(revision 40769)
+++ common.mk	(revision 40770)
@@ -836,7 +836,7 @@ newline.$(OBJEXT): $(NEWLINE_C) {$(VPATH https://github.com/ruby/ruby/blob/trunk/common.mk#L836
 
 verconf.h: verconf.in $(PREP) $(srcdir)/tool/shvar_to_cpp.rb $(RBCONFIG)
 	$(ECHO) creating $@
-	$(Q) $(MINIRUBY) "$(srcdir)/tool/shvar_to_cpp.rb" $< > $@
+	$(Q) $(MINIRUBY) "$(srcdir)/tool/shvar_to_cpp.rb" verconf.in > $@
 
 DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
 		eval.$(OBJEXT) \
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 40769)
+++ win32/Makefile.sub	(revision 40770)
@@ -699,6 +699,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/ https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L699
 #define EXECUTABLE_EXTS $(EXECUTABLE_EXTS)
 #define RUBY_COREDLL "$(RT)"
 #define LIBRUBY_SO "$(LIBRUBY_SO)"
+#define RUBY_PLATFORM "$(arch)"
+#define RUBY_SITEARCH "$(sitearch)"
 #if 0
 $(BANG)if "$(RUBY_SO_NAME)"!="$$(RUBY_SO_NAME)" || "$(ARCH)-$(PLATFORM)"!="$$(ARCH)-$$(PLATFORM)"
 config.h: nul
@@ -706,14 +708,13 @@ $(BANG)endif https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L708
 #endif
 #endif /* $(guard) */
 <<
-	@echo Creating verconf.h
-	@$(IFCHANGE) verconf.h <<
+	@echo Creating verconf.in
+	@$(IFCHANGE) verconf.in <<
 #define RUBY_LIB_VERSION_STYLE 3	/* full */
-#define RUBY_LIB_PREFIX "/lib/$(RUBY_BASE_NAME)"
-#define RUBY_PLATFORM "$(arch)"
-#define RUBY_SITEARCH "$(sitearch)"
+#define RUBY_EXEC_PREFIX ""
 <<
 	@exit > $(@:/=\)
+	@if exist verconf.h del verconf.h
 
 #!if exist($(RUBY_CONFIG_H))
 #! if exist(config_h.bak)

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