summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-16 01:40:34 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-16 01:40:34 +0000
commit1598a5a137ef46b027f5da7e86315ba25395ea5c (patch)
tree2002084b17580ff36bcddd3c5e608175d2186a30
parentefbf103388dfcce490522c86e8746a8a098734cc (diff)
* bcc32/Makefile.sub: quick hack... prepend DESTDIR.
still have restriction on DESTDIR ("", "/", "e:") git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--bcc32/Makefile.sub2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fc77c368a..0d9a4a4211 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Apr 16 10:36:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * bcc32/Makefile.sub: quick hack... prepend DESTDIR.
+ still have restriction on DESTDIR ("", "/", "e:")
+
Sat Apr 16 03:59:42 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/extconf.rb: check for OPENSSL_cleanse.
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index a6dcc67cf9..c00ad76772 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -427,7 +427,7 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
post-install-ext::
$(MINIRUBY) -I$(srcdir)lib -rrbconfig -rfileutils \
- -e 'FileUtils.rm_f(Dir[File.join(ARGV+[Config::CONFIG["archdir"],"**","*.tds"])])' "$(DESTDIR)"
+ -e 'FileUtils.rm_f(Dir["$(DESTDIR)"+Config::CONFIG["archdir"]+"/**/*.tds"])'
clean-local::
@$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib