1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/extmk.rb (extmake, parse_args): do not expand destdir.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8340 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-04-17 13:57:52 +00:00
parent 4afc07a666
commit b567351aff
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> Sat Apr 16 17:01:16 2005 Kouhei Sutou <kou@cozmixng.org>
* sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss): * sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss):

10
ext/extmk.rb
View File

@ -156,6 +156,9 @@ def extmake(target)
return true return true
end end
args = sysquote($mflags) args = sysquote($mflags)
unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
args << sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))
end
if $static if $static
args += ["static"] unless $clean args += ["static"] unless $clean
$extlist.push [$static, $target, File.basename($target), $preload] $extlist.push [$static, $target, File.basename($target), $preload]
@ -266,10 +269,6 @@ def parse_args()
end end
$continue = $mflags.set?(?k) $continue = $mflags.set?(?k)
if !$destdir.to_s.empty?
$destdir = File.expand_path($destdir)
$mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
end
if $extout if $extout
$extout = '$(topdir)/'+$extout $extout = '$(topdir)/'+$extout
$extout_prefix = $extout ? "$(extout)$(target_prefix)/" : "" $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
@ -446,6 +445,9 @@ rubies = []
} }
Dir.chdir ".." Dir.chdir ".."
unless $destdir.to_s.empty?
$mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
end
if !$extlist.empty? and $extupdate if !$extlist.empty? and $extupdate
rm_f(Config::CONFIG["LIBRUBY_SO"]) rm_f(Config::CONFIG["LIBRUBY_SO"])
end end