nobu	2010-10-07 18:10:47 +0900 (Thu, 07 Oct 2010)

  New Revision: 29421

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

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

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29420)
+++ ChangeLog	(revision 29421)
@@ -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]
+
 Thu Oct  7 09:14:28 2010  NARUSE, Yui  <naruse@r...>
 
 	* vm_exec.c (vm_exec_core):  Treat clang as non gcc on this
Index: cygwin/GNUmakefile.in
===================================================================
--- cygwin/GNUmakefile.in	(revision 29420)
+++ cygwin/GNUmakefile.in	(revision 29421)
@@ -40,7 +40,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: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 29420)
+++ win32/Makefile.sub	(revision 29421)
@@ -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)
@@ -873,7 +874,7 @@
 	@-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@F)
 !endif
 
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+$(RCFILES): $(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_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 29420)
+++ ruby_1_8/ChangeLog	(revision 29421)
@@ -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]
+
 Sun Oct  3 18:30:23 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (rb_intern): should check symbol table overflow.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 29420)
+++ ruby_1_8/version.h	(revision 29421)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-10-03"
+#define RUBY_RELEASE_DATE "2010-10-07"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20101003
+#define RUBY_RELEASE_CODE 20101007
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 7
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN
Index: ruby_1_8/cygwin/GNUmakefile.in
===================================================================
--- ruby_1_8/cygwin/GNUmakefile.in	(revision 29420)
+++ ruby_1_8/cygwin/GNUmakefile.in	(revision 29421)
@@ -38,7 +38,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_8/win32/Makefile.sub
===================================================================
--- ruby_1_8/win32/Makefile.sub	(revision 29420)
+++ ruby_1_8/win32/Makefile.sub	(revision 29421)
@@ -187,6 +187,7 @@
 
 DLDFLAGS = $(LDFLAGS) -dll
 SOLIBS = 
+RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
 
 LIBRUBY_LDSHARED = $(LDSHARED)
 LIBRUBY_DLDFLAGS = $(EXTLDFLAGS) -def:$(RUBYDEF)
@@ -648,7 +649,7 @@
 		    cd %CD% \
 		)
 
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+$(RCFILES): $(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) \

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