summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-08 00:35:20 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-08 00:35:20 +0000
commit978c0f0f0408dbdb5f0d3707157a304187161236 (patch)
tree7bafe1ae2e879e7e0bd738a3175ce5136eb15c1b
parent7fd6f82fe1ccc7dbaf839ccc19560eea3109a35a (diff)
mkmf.rb: RUBY_VERSION_NAME
* lib/mkmf.rb (MakeMakefile#configuration): set all ruby names. hdrdir now needs RUBY_VERSION_NAME. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb8
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d331beaadc..87437bde74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 8 09:35:17 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (MakeMakefile#configuration): set all ruby names.
+ hdrdir now needs RUBY_VERSION_NAME.
+
Fri Feb 8 08:58:26 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems/package/old.rb: Fix loading old format gems on ruby
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 226bb301fb..4b6c52e3f5 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1854,9 +1854,11 @@ LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
AR = #{CONFIG['AR']}
EXEEXT = #{CONFIG['EXEEXT']}
-RUBY_BASE_NAME = #{CONFIG['RUBY_BASE_NAME']}
-RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTALL_NAME']}
-RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
+}
+ CONFIG.each do |key, val|
+ mk << "#{key} = #{val}\n" if /^RUBY.*NAME/ =~ key
+ end
+ mk << %{
arch = #{CONFIG['arch']}
sitearch = #{CONFIG['sitearch']}
ruby_version = #{RbConfig::CONFIG['ruby_version']}