diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-09-10 09:53:04 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-09-10 09:53:04 +0000 |
| commit | 60924c27f5e9d84386d823a0c5f31add255f9519 (patch) | |
| tree | b1031447a2eab62b29d222cbcb252aeb1a4a4f3c /lib | |
| parent | 0618c23e7803251ceae36e9e5cb8e7a01633c23f (diff) | |
| download | ruby-60924c27f5e9d84386d823a0c5f31add255f9519.tar.gz ruby-60924c27f5e9d84386d823a0c5f31add255f9519.tar.xz ruby-60924c27f5e9d84386d823a0c5f31add255f9519.zip | |
* lib/mkmf.rb: $hdrdir is $top_srcdir if invoked from extmk.rb
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1e6a14481..646f85b41 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -43,6 +43,8 @@ $sitedir = CONFIG["sitedir"] $sitelibdir = CONFIG["sitelibdir"] $sitearchdir = CONFIG["sitearchdir"] +$extmk = /extmk\.rb/ =~ $0 + def dir_re(dir) Regexp.new('\$(?:\('+dir+'\)|\{'+dir+'\})(?:\$\(target_prefix\)|\{target_prefix\})?') end @@ -60,7 +62,7 @@ SITEINSTALL_DIRS = [ [dir_re('archdir'), "$(sitearchdir)$(target_prefix)"] ] -if File.exist? Config::CONFIG["archdir"] + "/ruby.h" +if not $extmk and File.exist? Config::CONFIG["archdir"] + "/ruby.h" $hdrdir = $archdir elsif File.exist? $srcdir + "/ruby.h" $hdrdir = $srcdir @@ -318,7 +320,7 @@ def append_library(libs, lib) end def message(*s) - unless /extmk\.rb/ =~ $0 and not $VERBOSE + unless $extmk and not $VERBOSE print(*s) STDOUT.flush end |