From 7b9431d98d37f57813fbcb1b72bd312f47f439a9 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 22 Apr 2004 09:25:16 +0000 Subject: * common.mk, ext/extmk.rb: make ext and .ext get removed by distclean. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/extmk.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ext/extmk.rb') diff --git a/ext/extmk.rb b/ext/extmk.rb index d5d0d87ecd..af52d97b1c 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -126,7 +126,7 @@ def extmake(target) end args = sysquote($mflags) if $static - args += ["static"] + args += ["static"] unless $clean $extlist.push [$static, $target, File.basename($target), $preload] end unless system($make, *args) @@ -317,10 +317,10 @@ exts |= Dir.glob("#{ext_prefix}/*/**/MANIFEST").collect {|d| } unless $extension if $extout - Config.expand(extout = $extout+"/.", Config::CONFIG.merge("topdir"=>$topdir)) + Config.expand(extout = $extout, Config::CONFIG.merge("topdir"=>$topdir)) if $install Config.expand(dest = "#{$destdir}#{$rubylibdir}") - FileUtils.cp_r(extout, dest, :verbose => true, :noop => $dryrun) + FileUtils.cp_r(extout+"/.", dest, :verbose => true, :noop => $dryrun) exit end unless $ignore @@ -340,10 +340,11 @@ $hdrdir = $top_srcdir = srcdir $topdir = "." if $ignore + FileUtils.rm_f(%W"extinit.c extinit.#{$OBJEXT}") if $clean Dir.chdir ".." if $clean Dir.rmdir('ext') rescue nil - FileUtils.rm_rf($extout) if $extout + FileUtils.rm_rf(extout) if $extout end exit end -- cgit v1.2.3