summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-08 01:52:09 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-08 01:52:09 +0000
commit26ea706823ae53ded2033ed8007b7acd0f09e8b5 (patch)
tree91fd4b789aa6b46652ae32ed7527fd194c82c142
parent3958011ecb8be0d4017305776cc2e65c7769fb9f (diff)
* common.mk (RBCONFIG): depends on version.h due to
RUBY_PATCHLEVEL. [ruby-core:32709] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk2
-rw-r--r--cygwin/GNUmakefile.in2
-rw-r--r--version.h6
-rw-r--r--win32/Makefile.sub2
5 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2574c09905..17713db24c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 8 10:51:56 2010 Nobuyoshi Nakada <[email protected]>
+
+ * common.mk (RBCONFIG): depends on version.h due to
+ RUBY_PATCHLEVEL. [ruby-core:32709]
+
Thu Oct 7 18:10:35 2010 Nobuyoshi Nakada <[email protected]>
* cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on
diff --git a/common.mk b/common.mk
index ccc9895f4b..9e72264261 100644
--- a/common.mk
+++ b/common.mk
@@ -345,7 +345,7 @@ extconf:
$(MAKEDIRS) "$(EXTCONFDIR)"
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
-$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
+$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
@$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
-install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) rbconfig.rb
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index cadba0a5fa..fb322c492a 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -38,7 +38,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
%.res.@OBJEXT@: %.rc
@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
-$(RCFILES): $(RBCONFIG) config.rb
+$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
@$(MINIRUBY) $(srcdir)/win32/resource.rb \
-ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
-so_name=$(DLL_BASE_NAME) \
diff --git a/version.h b/version.h
index 7295907f31..66a030706f 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-10-07"
+#define RUBY_RELEASE_DATE "2010-10-08"
#define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20101007
+#define RUBY_RELEASE_CODE 20101008
#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 7
+#define RUBY_RELEASE_DAY 8
#define NO_STRING_LITERAL_CONCATENATION 1
#ifdef RUBY_EXTERN
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index db6c38b05a..8c75cda0bf 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -649,7 +649,7 @@ clean-ext distclean-ext realclean-ext::
cd %CD% \
)
-$(RCFILES): $(RBCONFIG) config.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
@$(MINIRUBY) $(srcdir)/win32/resource.rb \
-ruby_name=$(RUBY_INSTALL_NAME) \
-rubyw_name=$(RUBYW_INSTALL_NAME) \