diff options
| author | Jack Nagel | 2013-04-06 13:09:24 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-04-06 13:10:12 -0500 |
| commit | 0520c36eedd90b8b3eed07f2bb21af1031c671b9 (patch) | |
| tree | 461cbf635756e81c714987ebdd2304113cacee0a /Library | |
| parent | acc21e70782932d8e31f99226fe1968c808babb1 (diff) | |
| download | homebrew-0520c36eedd90b8b3eed07f2bb21af1031c671b9.tar.bz2 | |
Replace literal paths to ruby with RUBY_PATH
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/macvim.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/rrdtool.rb | 5 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/--config.rb | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Library/Formula/macvim.rb b/Library/Formula/macvim.rb index ed17980ce..35da39544 100644 --- a/Library/Formula/macvim.rb +++ b/Library/Formula/macvim.rb @@ -39,7 +39,7 @@ class Macvim < Formula --enable-pythoninterp --enable-rubyinterp --enable-tclinterp - --with-ruby-command=/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby + --with-ruby-command=#{RUBY_PATH} ] args << "--enable-cscope" if build.include? "with-cscope" diff --git a/Library/Formula/rrdtool.rb b/Library/Formula/rrdtool.rb index c29181289..90bc0c067 100644 --- a/Library/Formula/rrdtool.rb +++ b/Library/Formula/rrdtool.rb @@ -23,9 +23,8 @@ class Rrdtool < Formula which_perl = which 'perl' which_ruby = which 'ruby' - ruby_path = "/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby" - opoo "Using system Ruby. RRD module will be installed to /Library/Ruby/..." if which_ruby.realpath.to_s == ruby_path + opoo "Using system Ruby. RRD module will be installed to /Library/Ruby/..." if which_ruby.realpath.to_s == RUBY_PATH opoo "Using system Perl. RRD module will be installed to /Library/Perl/..." if which_perl.to_s == "/usr/bin/perl" args = %W[ @@ -33,7 +32,7 @@ class Rrdtool < Formula --prefix=#{prefix} ] args << "--enable-perl-site-install" if which_perl.to_s == "/usr/bin/perl" - args << "--enable-ruby-site-install" if which_ruby.realpath.to_s == ruby_path + args << "--enable-ruby-site-install" if which_ruby.realpath.to_s == RUBY_PATH system "./configure", *args diff --git a/Library/Homebrew/cmd/--config.rb b/Library/Homebrew/cmd/--config.rb index 1143d5d00..77ee3a219 100644 --- a/Library/Homebrew/cmd/--config.rb +++ b/Library/Homebrew/cmd/--config.rb @@ -107,7 +107,7 @@ module Homebrew extend self puts "OS X: #{MACOS_FULL_VERSION}-#{kernel}" puts "Xcode: #{xcode}" if xcode puts "CLT: #{clt}" if clt - puts "/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby:\n #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}" if RUBY_VERSION.to_f != 1.8 + puts "#{RUBY_PATH}:\n #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}" if RUBY_VERSION.to_f != 1.8 unless MacOS.compilers_standard? puts "GCC-4.0: build #{gcc_40}" if gcc_40 |