From 978c0f0f0408dbdb5f0d3707157a304187161236 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 8 Feb 2013 00:35:20 +0000 Subject: 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 --- ChangeLog | 5 +++++ lib/mkmf.rb | 8 +++++--- 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 + + * lib/mkmf.rb (MakeMakefile#configuration): set all ruby names. + hdrdir now needs RUBY_VERSION_NAME. + Fri Feb 8 08:58:26 2013 Eric Hodel * 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']} -- cgit v1.2.3