From 52a67fe60d08eb982586695b8bd6b1ceb32b30da Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 23 Mar 2004 05:32:01 +0000 Subject: * Makefile.in, */Makefile.sub, common.mk (clean-local, distclean-local): separate files under directories due to directory separator. * */Makefile.sub (MKFILES): common.mk and */Makefile.sub should not be removed. * win32/Makefile.sub, wince/Makefile.sub: $* cannot appear in explicit rules. * cygwin/GNUmakefile.in: some mingw stuffs were missed. * lib/mkmf.rb (create_makefile): Borland make wrongly removes braces from command lines. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/extmk.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'ext/extmk.rb') diff --git a/ext/extmk.rb b/ext/extmk.rb index 4abe6a119d..94c091728f 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -116,6 +116,9 @@ def extmake(target) unless system($make, *args) $ignore or $continue or return false end + if $clean and $clean != true + File.unlink(makefile) rescue nil + end if $static $extflags ||= "" $extlibs ||= [] @@ -215,11 +218,11 @@ parse_args() if target = ARGV.shift and /^[a-z-]+$/ =~ target $mflags.push(target) - target = target.sub(/^(?:dist|real)(?=(?:clean)?$)/, '\1') + target = target.sub(/^(dist|real)(?=(?:clean)?$)/, '') case target when /clean/ $ignore ||= true - $clean = true + $clean = $1 ? $1[0] : true when /^install\b/ $install = true $ignore ||= true -- cgit v1.2.3