summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-07-06 07:37:50 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-07-06 07:37:50 +0000
commit48cf8795014ea2950230eaab5560b8fab15dd083 (patch)
tree0155c73ae1ddeb7e0ad3934bec8be3539c3349b6 /lib
parent64e7ed11fda266dbbd72e6b80acd310149b1ec71 (diff)
downloadruby-48cf8795014ea2950230eaab5560b8fab15dd083.tar.gz
ruby-48cf8795014ea2950230eaab5560b8fab15dd083.tar.xz
ruby-48cf8795014ea2950230eaab5560b8fab15dd083.zip
eban
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ae593224e..c042561e1 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -406,11 +406,7 @@ TARGET = #{target}
DLLIB = $(TARGET).#{CONFIG["DLEXT"]}
RUBY = #{CONFIG["ruby_install_name"]}
-<<<<<<< mkmf.rb
-RM = $(RUBY) -r ftools -e 'File::rm_f *Dir[ARGV.join(" ")]'
-=======
RM = $(RUBY) -r ftools -e 'File::rm_f(*Dir[ARGV.join(" ")])'
->>>>>>> 1.22
EXEEXT = #{CONFIG["EXEEXT"]}