* 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
This commit is contained in:
parent
6a096e49ad
commit
5c47cc1f0a
|
@ -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>
|
Mon Mar 28 16:23:26 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
|
||||||
|
|
||||||
* ext/tk/lib/tkextlib/iwidgets/notebook.rb: fixed typo.
|
* ext/tk/lib/tkextlib/iwidgets/notebook.rb: fixed typo.
|
||||||
|
|
|
@ -60,9 +60,11 @@ def extract_makefile(makefile, keep = true)
|
||||||
unless oldrb == newrb
|
unless oldrb == newrb
|
||||||
if $extout
|
if $extout
|
||||||
newrb.each {|f| installrb.delete(f)}
|
newrb.each {|f| installrb.delete(f)}
|
||||||
config = CONFIG.dup
|
unless installrb.empty?
|
||||||
install_dirs(target_prefix).each {|var, val| config[var] = val}
|
config = CONFIG.dup
|
||||||
FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, verbose: true)
|
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
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
@ -172,6 +174,7 @@ def extmake(target)
|
||||||
$extpath |= $LIBPATH
|
$extpath |= $LIBPATH
|
||||||
end
|
end
|
||||||
ensure
|
ensure
|
||||||
|
Config::CONFIG["srcdir"] = $top_srcdir
|
||||||
$hdrdir = $top_srcdir = top_srcdir
|
$hdrdir = $top_srcdir = top_srcdir
|
||||||
$topdir = topdir
|
$topdir = topdir
|
||||||
Dir.chdir dir
|
Dir.chdir dir
|
||||||
|
|
Loading…
Reference in New Issue