diff options
Diffstat (limited to 'Library/Formula/ruby.rb')
| -rw-r--r-- | Library/Formula/ruby.rb | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb index 7d0e13da5..a3ad85330 100644 --- a/Library/Formula/ruby.rb +++ b/Library/Formula/ruby.rb @@ -29,22 +29,6 @@ class Ruby < Formula end def install - ruby_lib = HOMEBREW_PREFIX+"lib/ruby" - - if File.exist? ruby_lib and File.symlink? ruby_lib - opoo "#{ruby_lib} exists as a symlink" - puts <<-EOS.undent - The previous Ruby formula symlinked #{ruby_lib} into Ruby's Cellar. - - This version creates this as a "real folder" in HOMEBREW_PREFIX - so that installed gems will survive between Ruby updates. - - Please remove this existing symlink before continuing: - rm #{ruby_lib} - EOS - exit 1 - end - system "autoconf" if ARGV.build_head? args = ["--prefix=#{prefix}", @@ -54,14 +38,14 @@ class Ruby < Formula args << "--with-arch=x86_64,i386" if ARGV.build_universal? # Put gem, site and vendor folders in the HOMEBREW_PREFIX - - (ruby_lib+'site_ruby').mkpath - (ruby_lib+'vendor_ruby').mkpath - (ruby_lib+'gems').mkpath - - (lib+'ruby').install_symlink ruby_lib+'site_ruby', - ruby_lib+'vendor_ruby', - ruby_lib+'gems' + ruby_lib = HOMEBREW_PREFIX/"lib/ruby" + (ruby_lib/'site_ruby').mkpath + (ruby_lib/'vendor_ruby').mkpath + (ruby_lib/'gems').mkpath + + (lib/'ruby').install_symlink ruby_lib/'site_ruby', + ruby_lib/'vendor_ruby', + ruby_lib/'gems' system "./configure", *args system "make" |