From fa4b9ad65a903f9f4e31269bcec3e03694517f59 Mon Sep 17 00:00:00 2001
From: Joshua Peek
Date: Fri, 20 Aug 2010 20:29:38 -0500
Subject: Update ruby formula to use standard vendor and site paths

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

* Put these in the HOMEBREW_PREFIX instead of the cellar, along
  with gems.
---
 Library/Formula/ruby.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'Library')

diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index 169edff1e..8c656b535 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -45,24 +45,26 @@ class Ruby <Formula
             "--with-readline-dir=#{Formula.factory('readline').prefix}",
             "--disable-debug",
             "--disable-dependency-tracking",
-            "--enable-shared",
-            "--with-sitedir=#{ruby_lib}/site",
-            "--with-vendordir=#{ruby_lib}/vendor"]
+            "--enable-shared"]
 
     args << "--program-suffix=19" if ARGV.include? "--with-suffix"
 
     # Put gem, site and vendor folders in the HOMEBREW_PREFIX
-    (ruby_lib+'site').mkpath
-    (ruby_lib+'vendor').mkpath
+
+    (ruby_lib+'site_ruby').mkpath
+    (ruby_lib+'vendor_ruby').mkpath
     (ruby_lib+'gems').mkpath
 
+    (lib+'ruby').mkpath
+    ln_s (ruby_lib+'site_ruby'), (lib+'ruby')
+    ln_s (ruby_lib+'vendor_ruby'), (lib+'ruby')
+    ln_s (ruby_lib+'gems'), (lib+'ruby')
+
     system "./configure", *args
     system "make"
     system "make install"
     system "make install-doc" if ARGV.include? "--with-doc"
 
-    # Symlink HOMEBREW_PREFIX gems to Ruby in the Cellar
-    ln_s (ruby_lib+'gems'), (lib+"ruby/gems")
   end
 
   def caveats; <<-EOS.undent
-- 
cgit v1.2.3