diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-28 11:53:52 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-28 11:53:52 +0000 |
| commit | 5c47cc1f0ab1617762a7f05167a84e0ef636f4bd (patch) | |
| tree | 449b78712e16d251152829175286f4c44412d517 /ext | |
| parent | 6a096e49add687349d8b24074de31b9a7405585b (diff) | |
| download | ruby-5c47cc1f0ab1617762a7f05167a84e0ef636f4bd.tar.gz | |
* ext/extmk.rb (extract_makefile): nothing to be removed when no file
was deleted.
* ext/extmk.rb (extmake): restore srcdir.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 77e65b5c22..db4bdf3ce0 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -60,9 +60,11 @@ def extract_makefile(makefile, keep = true) unless oldrb == newrb if $extout newrb.each {|f| installrb.delete(f)} - config = CONFIG.dup - install_dirs(target_prefix).each {|var, val| config[var] = val} - FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, verbose: true) + unless installrb.empty? + config = CONFIG.dup + install_dirs(target_prefix).each {|var, val| config[var] = val} + FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, verbose: true) + end end return false end @@ -172,6 +174,7 @@ def extmake(target) $extpath |= $LIBPATH end ensure + Config::CONFIG["srcdir"] = $top_srcdir $hdrdir = $top_srcdir = top_srcdir $topdir = topdir Dir.chdir dir |