[macruby-changes] [267] MacRuby/trunk/instruby.rb

[source_changes at macosforge.org]

Revision: 267
          http://trac.macosforge.org/projects/ruby/changeset/267
Author:   lsansonetti at apple.com
Date:     2008-06-11 13:48:09 -0700 (Wed, 11 Jun 2008)

Log Message:
-----------
fix DESTDIR install

Modified Paths:
--------------
    MacRuby/trunk/instruby.rb

Modified: MacRuby/trunk/instruby.rb
===================================================================
--- MacRuby/trunk/instruby.rb	2008-06-07 03:42:33 UTC (rev 266)
+++ MacRuby/trunk/instruby.rb	2008-06-11 20:48:09 UTC (rev 267)
@@ -461,7 +461,7 @@
   # Installing executable links.
   dest_bin = '/usr/local/bin'
   mkdir_p dest_bin, :mode => 0755
-  Dir.entries(CONFIG['bindir']).each do |bin|
+  Dir.entries(with_destdir(CONFIG['bindir'])).each do |bin|
     next if bin[0] == '.'
     link = File.join("../../../", CONFIG['bindir'], bin)
     link.sub!(/#{MACRUBY_VERSION}/, 'Current')
@@ -470,11 +470,11 @@
   # Installing man pages links.
   dest_man = '/usr/local/share/man'
   mkdir_p dest_man, :mode => 0755
-  Dir.entries(CONFIG['mandir']).each do |mandir|
+  Dir.entries(with_destdir(CONFIG['mandir'])).each do |mandir|
     next if mandir[0] == '.'
-    if File.stat(File.join(CONFIG['mandir'], mandir)).directory?
+    if File.stat(File.join(with_destdir(CONFIG['mandir']), mandir)).directory?
       mkdir_p File.join(dest_man, File.basename(mandir)), :mode => 0755
-      Dir.entries(File.join(CONFIG['mandir'], mandir)).each do |man|
+      Dir.entries(File.join(with_destdir(CONFIG['mandir']), mandir)).each do |man|
         next if man[0] == '.'
         link = File.join("../../../../../", CONFIG['mandir'], mandir, man)
         link.sub!(/#{MACRUBY_VERSION}/, 'Current')

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080611/5bd43527/attachment.htm