diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-08 07:38:53 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-08 07:38:53 +0000 |
| commit | 3d1b573946ee26775da3268ba585b2276c659342 (patch) | |
| tree | ef3334fb6e7e583eaefedb2a62af0bdb5d34d5e1 | |
| parent | ec847fad4e0c1b96c6cf91e7ff14ef0820f7ccc3 (diff) | |
| download | ruby-3d1b573946ee26775da3268ba585b2276c659342.tar.gz | |
* ext/extmk.rb (extmake): follow Array#to_s.
* lib/mkmf.rb (create_makefile): ditto.
* win32/resource.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/extmk.rb | 2 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 | ||||
| -rw-r--r-- | win32/resource.rb | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Fri Sep 8 16:36:27 2006 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/extmk.rb (extmake): follow Array#to_s. + + * lib/mkmf.rb (create_makefile): ditto. + + * win32/resource.rb: ditto. + Fri Sep 8 10:00:12 2006 GOTOU Yuuzou <gotoyuzo@notwork.org> * lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookies): new diff --git a/ext/extmk.rb b/ext/extmk.rb index a9fad432bd..2e17d05959 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -155,7 +155,7 @@ def extmake(target) ok = yield(ok) if block_given? unless ok open(makefile, "w") do |f| - f.print dummy_makefile(CONFIG["srcdir"]) + f.print *dummy_makefile(CONFIG["srcdir"]) end return true end diff --git a/lib/mkmf.rb b/lib/mkmf.rb index fb66d0cdec..e336b6ecd5 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1390,7 +1390,7 @@ site-install-rb: install-rb unless suffixes.empty? mfile.print ".SUFFIXES: .", suffixes.uniq.join(" ."), "\n\n" end - mfile.print *depout + mfile.print *depout.flatten else headers = %w[ruby.h defines.h] if RULE_SUBST diff --git a/win32/resource.rb b/win32/resource.rb index 35b987cad4..e8c3ed88c7 100644 --- a/win32/resource.rb +++ b/win32/resource.rb @@ -60,7 +60,7 @@ end #include <winver.h> #endif -#{icons || ''} +#{icons ? icons.join : ''} VS_VERSION_INFO VERSIONINFO FILEVERSION #{fversion} PRODUCTVERSION #{fversion} |