Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
respect DESTDIR
git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/trunk@4266 23306eb0-4c56-4727-a40e-e92c0eb68959
  • Loading branch information
lrz committed Jun 23, 2010
1 parent 8116003 commit 5943bc5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion instruby.rb
Expand Up @@ -139,7 +139,7 @@ def install(src, dest, options = {})
$installed_list.puts dest
end
if strip
system("/usr/bin/strip -x \"#{dest}\"")
system("/usr/bin/strip -x \"#{with_destdir(dest)}\"")
end
end

Expand Down
5 changes: 3 additions & 2 deletions rakelib/builder.rake
Expand Up @@ -186,12 +186,13 @@ namespace :framework do
task :install_ext do
Builder::Ext.install
# Install the extensions rbo.
dest_site = File.join(DESTDIR, RUBY_SITE_LIB2)
Dir.glob('ext/**/lib/**/*.rbo').each do |path|
ext_name, sub_path = path.scan(/^ext\/(.+)\/lib\/(.+)$/)[0]
next unless EXTENSIONS.include?(ext_name)
sub_dir = File.dirname(sub_path)
sh "/usr/bin/install -c -m 0755 #{path} #{File.join(RUBY_SITE_LIB2, sub_dir)}"
sh "/usr/bin/strip -x #{File.join(RUBY_SITE_LIB2, sub_path)}"
sh "/usr/bin/install -c -m 0755 #{path} #{File.join(dest_site, sub_dir)}"
sh "/usr/bin/strip -x #{File.join(dest_site, sub_path)}"
end
end

Expand Down

0 comments on commit 5943bc5

Please sign in to comment.