From 5c47cc1f0ab1617762a7f05167a84e0ef636f4bd Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 28 Mar 2005 11:53:52 +0000 Subject: [PATCH] * 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 --- ChangeLog | 7 +++++++ ext/extmk.rb | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01e3c92a2c..615f61aa21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Mar 28 20:53:44 2005 Nobuyoshi Nakada + + * 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 * ext/tk/lib/tkextlib/iwidgets/notebook.rb: fixed typo. 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