From c2f8d06380e49ca809fc88818e8bde91c0df04dc Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Feb 2007 19:10:44 +0000
Subject: * mkconfig.rb (patchlevel): read from version.h.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@11951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 4 ++++
 mkconfig.rb | 5 ++++-
 version.h   | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 98b586d0b..f4997c9cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar  1 04:08:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb (patchlevel): read from version.h.
+
 Thu Mar  1 03:42:09 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
diff --git a/mkconfig.rb b/mkconfig.rb
index b47b7423c..fdc3dcf0a 100755
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -112,7 +112,10 @@ unless has_version
     print "  CONFIG[\"MINOR\"] = \"" + $2 + "\"\n"
     print "  CONFIG[\"TEENY\"] = \"" + $3 + "\"\n"
   }
-  print "   CONFIG[\"PATCHLEVEL\"] = \"" + RUBY_PATCHLEVEL + "\"\n"
+  patchlevel = IO.foreach(File.join(srcdir, "version.h")) {|l|
+    m = /^\s*#\s*define\s+RUBY_PATCHLEVEL\s+(\d+)/.match(l) and break m[1]
+  }
+  print "  CONFIG[\"PATCHLEVEL\"] = \"#{patchlevel}\"\n"
 end
 
 dest = drive ? /= \"(?!\$[\(\{])(?:[a-z]:)?/i : /= \"(?!\$[\(\{])/
diff --git a/version.h b/version.h
index e9522e3b1..6ec466215 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,9 @@
 #define RUBY_RELEASE_MONTH 2
 #define RUBY_RELEASE_DAY 28
 
+#ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];
 RUBY_EXTERN const char ruby_platform[];
 RUBY_EXTERN const int ruby_patchlevel;
+#endif
-- 
cgit