diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-04 15:20:10 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-04 15:20:10 +0000 |
| commit | aa735c912578e98b491ef42021253e61e1e35c10 (patch) | |
| tree | 151f657d02363f2c8a325b6ad87f47f3879df5ce | |
| parent | af26b7db47f5c8cb498b2b569eb4d424addcf8be (diff) | |
* extmk.rb (extmake): needs to be wrapped in an Array.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/extmk.rb | 5 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Fri Aug 5 00:19:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * extmk.rb (extmake): needs to be wrapped in an Array. + Thu Aug 4 18:38:36 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tcltklib/tcltklib.c: cannot compile for Tcl7.6/Tk4.2. @@ -6,10 +10,10 @@ Thu Aug 4 18:38:36 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tcltklib/stubs.c: ditto. - * ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding= + * ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding= when Tcl is 7.6 or 8.0. - * ext/tk/lib/tk/wm.rb: support to make some methods as options of + * ext/tk/lib/tk/wm.rb: support to make some methods as options of root or toplevel widget. [ruby-talk:150336] * ext/tk/lib/tk/root.rb: ditto. diff --git a/ext/extmk.rb b/ext/extmk.rb index cb44c5e4ac..26651195a1 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -158,7 +158,7 @@ def extmake(target) end args = sysquote($mflags) unless $destdir.to_s.empty? or $mflags.include?("DESTDIR") - args += sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix)) + args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))] end if $static args += ["static"] unless $clean @@ -428,7 +428,8 @@ SRC $extpath.delete("$(topdir)") $extflags = libpathflag($extpath) << " " << $extflags.strip conf = [ - ['SETUP', $setup], [$enable_shared && !$force_static ? 'DLDOBJS' : 'EXTOBJS', $extobjs], + ['SETUP', $setup], + [enable_config("shared", $enable_shared) ? 'DLDOBJS' : 'EXTOBJS', $extobjs], ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags] ].map {|n, v| "#{n}=#{v}" if v and !(v = v.strip).empty? |