merge revision(s) 22932:


	* mkconfig.rb (patchlevel): config.status may not contain
	  PATCHLEVEL even if other version numbers exist.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 15 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 16ebb9d0c1..71a944283a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 24 16:24:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb (patchlevel): config.status may not contain
+	  PATCHLEVEL even if other version numbers exist.
+
 Wed Nov 24 16:18:02 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* win32/Makefile.sub ($(RCFILES)): no revision.h in this
diff --git a/mkconfig.rb b/mkconfig.rb
index 255bfa7436..f662c825e3 100755
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -37,6 +37,7 @@ v_fast = []
 v_others = []
 vars = {}
 has_version = false
+has_patchlevel = false
 continued_name = nil
 continued_line = nil
 File.foreach "config.status" do |line|
@@ -95,7 +96,12 @@ File.foreach "config.status" do |line|
     else
       v_others << v
     end
-    has_version = true if name == "MAJOR"
+    case name
+    when "MAJOR"
+      has_version = true
+    when "PATCHLEVEL"
+      has_patchlevel = true
+    end
   end
 #  break if /^CEOF/
 end
@@ -114,6 +120,8 @@ unless has_version
     print "  CONFIG[\"MINOR\"] = \"" + $2 + "\"\n"
     print "  CONFIG[\"TEENY\"] = \"" + $3 + "\"\n"
   }
+end
+unless has_patchlevel
   patchlevel = IO.foreach(File.join(srcdir, "version.h")) {|l|
     m = /^\s*#\s*define\s+RUBY_PATCHLEVEL\s+(\d+)/.match(l) and break m[1]
   }
diff --git a/version.h b/version.h
index 27884a1c93..deb152152b 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-11-24"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20101124
-#define RUBY_PATCHLEVEL 324
+#define RUBY_PATCHLEVEL 325
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8