yugui	2010-12-02 17:06:12 +0900 (Thu, 02 Dec 2010)

  New Revision: 30032

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

  Log:
    merges r29421 from trunk into ruby_1_9_2.
    --
    * cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on
      real config.rb file.  [ruby-core:32709]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/cygwin/GNUmakefile.in
    branches/ruby_1_9_2/version.h
    branches/ruby_1_9_2/win32/Makefile.sub

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30031)
+++ ruby_1_9_2/ChangeLog	(revision 30032)
@@ -1,3 +1,8 @@
+Thu Oct  7 18:10:35 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on
+	  real config.rb file.  [ruby-core:32709]
+
 Wed Oct  6 11:52:12 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (fptr_finalize): write_mutex might have been destroyed
Index: ruby_1_9_2/cygwin/GNUmakefile.in
===================================================================
--- ruby_1_9_2/cygwin/GNUmakefile.in	(revision 30031)
+++ ruby_1_9_2/cygwin/GNUmakefile.in	(revision 30032)
@@ -41,7 +41,7 @@
 %.res.@OBJEXT@: %.rc
 	$(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-$(RCFILES): $(RBCONFIG)
+$(RCFILES): $(RBCONFIG) config.rb
 	@$(MINIRUBY) $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
 	  -so_name=$(DLL_BASE_NAME) \
Index: ruby_1_9_2/win32/Makefile.sub
===================================================================
--- ruby_1_9_2/win32/Makefile.sub	(revision 30031)
+++ ruby_1_9_2/win32/Makefile.sub	(revision 30032)
@@ -237,6 +237,7 @@
 
 DLDFLAGS = $(LDFLAGS) -dll
 SOLIBS = 
+RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
 
 LIBRUBY_LDSHARED = $(LDSHARED)
 LIBRUBY_DLDFLAGS = $(EXTLDFLAGS) -implib:dummy.lib -def:$(RUBYDEF)
@@ -845,7 +846,7 @@
 distclean-ext realclean-ext::
 		@-rmdir ext
 
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) config.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
 			-ruby_name=$(RUBY_INSTALL_NAME) \
 			-rubyw_name=$(RUBYW_INSTALL_NAME) \
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30031)
+++ ruby_1_9_2/version.h	(revision 30032)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 62
+#define RUBY_PATCHLEVEL 63
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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