diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-30 04:49:27 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-30 04:49:27 +0000 |
| commit | 2e2e0193b93ec4629f0704d719849e09a08e9429 (patch) | |
| tree | 7b5905e3d9579b58a807fdbbe003efc0045f9b27 | |
| parent | fa52c1fa23611c64ba39f2c9a60f2902e9d1a6c8 (diff) | |
| download | ruby-2e2e0193b93ec4629f0704d719849e09a08e9429.tar.gz ruby-2e2e0193b93ec4629f0704d719849e09a08e9429.tar.xz ruby-2e2e0193b93ec4629f0704d719849e09a08e9429.zip | |
* lib/mkmf.rb: initialize $top_srcdir always. [ruby-dev:31682]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,6 @@ -Thu Aug 30 13:13:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Aug 30 13:49:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb: initialize $top_srcdir always. [ruby-dev:31682] * lib/mkmf.rb (try_const, have_const): check for a const is defined. [ruby-core:04422] diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 5794c16ce..cb5bd9fc2 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -124,6 +124,7 @@ extdir = File.expand_path("ext", topdir) $extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/" if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h") $topdir = $hdrdir + $top_srcdir = $hdrdir $arch_hdrdir = $hdrdir + "/$(arch)" elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h") and File.exist?("#{CONFIG["EXTOUT"]}/include/#{CONFIG["arch"]}/ruby/config.h") |