diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ext/extmk.rb | 10 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Sun Apr 17 22:57:09 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb (extmake, parse_args): do not expand destdir. + Sat Apr 16 17:01:16 2005 Kouhei Sutou <kou@cozmixng.org> * sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss): diff --git a/ext/extmk.rb b/ext/extmk.rb index 859538fe52..f14475fcab 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -156,6 +156,9 @@ def extmake(target) return true end args = sysquote($mflags) + unless $destdir.to_s.empty? or $mflags.include?("DESTDIR") + args << sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix)) + end if $static args += ["static"] unless $clean $extlist.push [$static, $target, File.basename($target), $preload] @@ -265,10 +268,6 @@ def parse_args() end $continue = $mflags.set?(?k) - if !$destdir.to_s.empty? - $destdir = File.expand_path($destdir) - $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}" - end if $extout $extout = '$(topdir)/'+$extout $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : "" @@ -445,6 +444,9 @@ rubies = [] } Dir.chdir ".." +unless $destdir.to_s.empty? + $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}" +end if !$extlist.empty? and $extupdate rm_f(Config::CONFIG["LIBRUBY_SO"]) end |