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

[source_changes at macosforge.org]

Revision: 228
          http://trac.macosforge.org/projects/ruby/changeset/228
Author:   lsansonetti at apple.com
Date:     2008-05-27 16:44:12 -0700 (Tue, 27 May 2008)

Log Message:
-----------
do not install the MR stuff twice during 'make install'

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

Modified: MacRuby/trunk/instruby.rb
===================================================================
--- MacRuby/trunk/instruby.rb	2008-05-27 19:09:04 UTC (rev 227)
+++ MacRuby/trunk/instruby.rb	2008-05-27 23:44:12 UTC (rev 228)
@@ -276,10 +276,13 @@
   end
 end
 
+$installing_rdoc = false
+
 install?(:rdoc) do
   if $rdocdir
     puts "installing rdoc"
 
+    $installing_rdoc = true
     ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR).$(TEENY)/system')
     Config.expand(ridatadir)
     makedirs [ridatadir]
@@ -428,6 +431,8 @@
   Dir.glob(File.join(to, '**', '.svn')).each { |x| rm_rf(x) }
 end
 
+unless $installing_rdoc
+
 install_stuff('Xcode templates', 'misc/xcode-templates', 
   '/Library/Application Support/Developer/3.0/Xcode', 0755)
 install_stuff('samples', 'sample-macruby', 
@@ -484,4 +489,6 @@
   end
 end
 
+end # unless $installing_rdoc
+
 # vi:set sw=2:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080527/76dfc53f/attachment-0001.htm