summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-09 07:54:49 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-09 07:54:49 +0000
commit4d134d47d6d39e68ff8178f2726c0289b4b825f7 (patch)
treeb56b7f9949965c63a33046d1574fb5c327984c63
parente45f8f994337131f9329e0780a64aa75c3586a7f (diff)
* ext/extmk.rb.in: modify RM macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/extmk.rb.in6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ddd2a76174..68902b3962 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 9 16:49:30 2001 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/extmk.rb.in: modify RM macro.
+
Sun Jul 8 20:52:02 2001 Akinori MUSHA <knu@iDaemons.org>
* ruby.h: fix a wrong function name: rb_iglob() -> rb_globi().
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index a88a9ea7a3..941d9d5dab 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -45,8 +45,8 @@ def rm_f(*files)
targets.concat Dir[file]
end
if not targets.empty?
- File::chmod 0777, *targets
- File::unlink *targets
+ File::chmod(0777, *targets)
+ File::unlink(*targets)
end
end
@@ -472,7 +472,7 @@ TARGET = #{target}
DLLIB = $(TARGET).#{$static ? $LIBEXT : "@DLEXT@"}
RUBY = #{ruby_interpreter} -I$(topdir) -I$(hdrdir)/lib
-RM = $(RUBY) -r ftools -e "File::rm_f(*Dir[ARGV.join(' ')])"
+RM = $(RUBY) -rftools -e 'File::rm_f(*ARGV.map{|x|Dir[x]}.flatten.uniq)'
EXEEXT = @EXEEXT@