[macruby-changes] [4266] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 4266
          http://trac.macosforge.org/projects/ruby/changeset/4266
Author:   lsansonetti at apple.com
Date:     2010-06-22 18:58:00 -0700 (Tue, 22 Jun 2010)
Log Message:
-----------
respect DESTDIR

Modified Paths:
--------------
    MacRuby/trunk/instruby.rb
    MacRuby/trunk/rakelib/builder.rake

Modified: MacRuby/trunk/instruby.rb
===================================================================
--- MacRuby/trunk/instruby.rb	2010-06-23 01:12:35 UTC (rev 4265)
+++ MacRuby/trunk/instruby.rb	2010-06-23 01:58:00 UTC (rev 4266)
@@ -139,7 +139,7 @@
     $installed_list.puts dest
   end
   if strip
-    system("/usr/bin/strip -x \"#{dest}\"")
+    system("/usr/bin/strip -x \"#{with_destdir(dest)}\"")
   end
 end
 

Modified: MacRuby/trunk/rakelib/builder.rake
===================================================================
--- MacRuby/trunk/rakelib/builder.rake	2010-06-23 01:12:35 UTC (rev 4265)
+++ MacRuby/trunk/rakelib/builder.rake	2010-06-23 01:58:00 UTC (rev 4266)
@@ -186,12 +186,13 @@
   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
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100622/6264a268/attachment.html>