diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-05-06 04:32:49 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-05-06 04:32:49 +0000 |
| commit | ce8634e1e1e54911b90d925c997499c838011708 (patch) | |
| tree | 442b1260e80361ffb525d54f4b559768941eec62 | |
| parent | c5b2063c25294e6aa61618e06a0d611c11ed4278 (diff) | |
| download | ruby-ce8634e1e1e54911b90d925c997499c838011708.tar.gz ruby-ce8634e1e1e54911b90d925c997499c838011708.tar.xz ruby-ce8634e1e1e54911b90d925c997499c838011708.zip | |
* ext/extmk.rb: get rid of side effect of Config.expand, patched by
<tttt01@infoseek.jp> (ruby-bugs:PR#597)
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/extmk.rb | 2 |
2 files changed, 7 insertions, 2 deletions
@@ -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 af52d97b1..7d49f49e3 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) |