aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-06-01 02:35:35 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-06-01 02:35:35 +0000
commitec983004055224313f3cd08681d1c27ef31baab0 (patch)
tree9a7b9b4cb25f7ab0a87b5aa2fcd45a748bbf17c9
parentfe473adee74c644234893a76090a997a51275eeb (diff)
downloadruby-ec983004055224313f3cd08681d1c27ef31baab0.tar.gz
* bcc32/Makefile.sub: can use single quote character in DESTDIR.
[ruby-dev:26205] * bcc32/Makefile.sub: Dir.glob in 1.9 doesn't treat \ as path separator. [ruby-dev:26254] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--bcc32/Makefile.sub2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c8e5791da..3f1548206e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 1 11:30:09 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * bcc32/Makefile.sub: can use single quote character in DESTDIR.
+ [ruby-dev:26205]
+
+ * bcc32/Makefile.sub: Dir.glob in 1.9 doesn't treat \ as path separator.
+ [ruby-dev:26254]
+
Tue May 31 15:52:45 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 507af0317a..1570c33c41 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -442,7 +442,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['$(DESTDIR)'+Config::CONFIG['archdir']+'/**/*.tds'])"
+ -e "FileUtils.rm_f(Dir[ARGV[0]+Config::CONFIG['archdir']+'/**/*.tds'])" "$(DESTDIR:\=/)"
clean-local::
@$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib