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 | 29a898633257c48abf6f85b951e7d62d65a7be88 (patch) | |
| tree | 449b78712e16d251152829175286f4c44412d517 | |
| parent | f9c322ab1e1131ef0cb7a6ac43c4c8ba6f3fe36a (diff) | |
| download | ruby-29a898633257c48abf6f85b951e7d62d65a7be88.tar.gz ruby-29a898633257c48abf6f85b951e7d62d65a7be88.tar.xz ruby-29a898633257c48abf6f85b951e7d62d65a7be88.zip | |
* ext/extmk.rb (extract_makefile): nothing to be removed when no file
was deleted.
* ext/extmk.rb (extmake): restore srcdir.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/extmk.rb | 9 |
2 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Mon Mar 28 20:53:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb (extract_makefile): nothing to be removed when no file + was deleted. + + * ext/extmk.rb (extmake): restore srcdir. + Mon Mar 28 16:23:26 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * ext/tk/lib/tkextlib/iwidgets/notebook.rb: fixed typo. diff --git a/ext/extmk.rb b/ext/extmk.rb index 77e65b5c2..db4bdf3ce 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 |