diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-18 09:50:14 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-18 09:50:14 +0000 |
| commit | 311fdfdfeaceb581c51602f5aeeff40c12567a78 (patch) | |
| tree | 532e04965de3bfc286188da5da53dae2aeb3bbe2 /mkconfig.rb | |
| parent | 29696a17382798c8f03d28000476bc7fcb77018d (diff) | |
* mkconfig.rb: no longer embed srcdir and compile_dir into
rbconfig.rb.
* ext/extmk.rb, lib/mkmf.rb: obtain top_srcdir and topdir from library
paths.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'mkconfig.rb')
| -rw-r--r-- | mkconfig.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/mkconfig.rb b/mkconfig.rb index ef54287db5..08f8dc166e 100644 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -1,7 +1,6 @@ #!./miniruby -s # avoid warnings with -d. -$srcdir ||= nil $install_name ||= nil $so_name ||= nil @@ -9,7 +8,6 @@ require File.dirname($0)+"/lib/fileutils" mkconfig = File.basename($0) rbconfig_rb = ARGV[0] || 'rbconfig.rb' -srcdir = $srcdir || '.' unless File.directory?(dir = File.dirname(rbconfig_rb)) FileUtils.makedirs(dir, :verbose => true) end @@ -54,17 +52,12 @@ File.foreach "config.status" do |line| v_others << v end has_version = true if name == "MAJOR" - elsif /^(?:ac_given_)?srcdir=(.*)/ =~ line - srcdir = $1.strip elsif /^ac_given_INSTALL=(.*)/ =~ line v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n" end # break if /^CEOF/ end -srcdir = File.expand_path(srcdir) -v_fast.unshift(" CONFIG[\"srcdir\"] = \"" + srcdir + "\"\n") - v_fast.collect! do |x| if /"prefix"/ === x x.sub(/= (.*)/, '= (TOPDIR || DESTDIR + \1)') @@ -113,7 +106,7 @@ print <<EOS CONFIG["archdir"] = "$(rubylibdir)/$(arch)" CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" - CONFIG["compile_dir"] = "#{Dir.pwd}" + CONFIG["topdir"] = File.dirname(__FILE__) MAKEFILE_CONFIG = {} CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} def Config::expand(val, config = CONFIG) |