summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-09 08:10:26 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-09 08:10:26 +0000
commitf1b3c517015e0eb1c7f6358ea9cc52f745464fca (patch)
treecf6f96aac7bb67bd1a61c656cfc7232f2618c558
parent4d134d47d6d39e68ff8178f2726c0289b4b825f7 (diff)
* lib/mkmf.rb: modify RM macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--lib/mkmf.rb6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 68902b3962..e7376ba3aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ Mon Jul 9 16:49:30 2001 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/extmk.rb.in: modify RM macro.
+ * lib/mkmf.rb: ditto.
+
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/lib/mkmf.rb b/lib/mkmf.rb
index 92d216a12d..fec789e4e8 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -53,8 +53,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
@@ -469,7 +469,7 @@ TARGET = #{target}
DLLIB = $(TARGET).#{CONFIG["DLEXT"]}
RUBY = #{CONFIG["ruby_install_name"]}
-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 = #{CONFIG["EXEEXT"]}