diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ext/extmk.rb | 9 |
2 files changed, 17 insertions, 5 deletions
@@ -1,17 +1,22 @@ +Wed Mar 2 19:53:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb (parse_args): add DESTDIR only when not directed + already. fixed: [ruby-dev:25781] + Wed Mar 2 17:14:18 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tcltklib/tcltklib.c (lib_eventloop_core): fix typo Wed Mar 2 16:00:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> - * ext/tcltklib/tcltklib.c: enforce thread-check and exception-handling + * ext/tcltklib/tcltklib.c: enforce thread-check and exception-handling to avoid SEGV trouble. [KNOWN BUG] When supports pthread and running multiple Tk interpreters, an interrupt signal causes SEGV frequently. That may be a trouble of Ruby's signal handler. * ext/tk/tkutil/tkutil.c; fix a bug on converting a SJIS string array - to a Tcl's list string. + to a Tcl's list string. * ext/tk/tcltklib.c: wrap Tcl's original "namespace" command to protect from namespace crash. @@ -33,7 +38,7 @@ Wed Mar 2 16:00:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/clock.rb (self.clicks): accept a Symbol argument. * ext/tk/lib/variable.rb: be able to set default_value_type; :numeric, - :bool, :string, :symbol, :list, :numlist or nil (default; same to + :bool, :string, :symbol, :list, :numlist or nil (default; same to :string). If set a type, TkVariable#value returns a value of the type. @@ -54,7 +59,7 @@ Wed Mar 2 16:00:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Tue Mar 1 00:47:43 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> - * test/rinda/test_rinda.rb: backport from CVS_HEAD. use + * test/rinda/test_rinda.rb: backport from CVS_HEAD. use MockClock.sleep instead of Kernel.sleep [ruby-dev:25387] Tue Mar 1 00:34:24 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> diff --git a/ext/extmk.rb b/ext/extmk.rb index 88f5028a39..a1feb80205 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -157,6 +157,10 @@ def parse_args() grep(/\A-(?!-).*#{'%c' % flag}/i) { return true } false end + def $mflags.defined?(var) + grep(/\A#{var}=(.*)/) {return $1} + false + end if $mflags.set?(?n) $dryrun = true @@ -165,7 +169,10 @@ def parse_args() end $continue = $mflags.set?(?k) - $mflags |= ["DESTDIR=#{$destdir}"] + if !$destdir.to_s.empty? + $destdir = File.expand_path($destdir) + $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}" + end end parse_args() |