summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-06 04:32:49 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-06 04:32:49 +0000
commitb21aa86d5c34128e4acdc9d9dc975d548919f1cd (patch)
tree442b1260e80361ffb525d54f4b559768941eec62
parent7cb6dfb8fcdb73058775b978b9f3b5c55d13f718 (diff)
* ext/extmk.rb: get rid of side effect of Config.expand, patched by
<tttt01@infoseek.jp> (ruby-bugs:PR#597) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/extmk.rb2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a0a856d402..b51d137429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 6 13:32:44 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb: get rid of side effect of Config.expand, patched by
+ <tttt01@infoseek.jp> (ruby-bugs:PR#597)
+
Thu May 6 11:40:28 2004 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (string): accept NIL.
@@ -6,7 +11,7 @@ Thu May 6 11:40:28 2004 Shugo Maeda <shugo@ruby-lang.org>
Thu May 6 01:59:04 2004 Dave Thomas <dave@pragprog.com>
- * lib/rdoc/generators/html_generator.rb (Generators::HtmlMethod::params):
+ * lib/rdoc/generators/html_generator.rb (Generators::HtmlMethod::params):
Don't include the &block parameter if we have explicit
yield parameters.
diff --git a/ext/extmk.rb b/ext/extmk.rb
index af52d97b1c..7d49f49e39 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -317,7 +317,7 @@ exts |= Dir.glob("#{ext_prefix}/*/**/MANIFEST").collect {|d|
} unless $extension
if $extout
- Config.expand(extout = $extout, Config::CONFIG.merge("topdir"=>$topdir))
+ Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir))
if $install
Config.expand(dest = "#{$destdir}#{$rubylibdir}")
FileUtils.cp_r(extout+"/.", dest, :verbose => true, :noop => $dryrun)