From f3ad66f69979cd107025b6edd07bbe6c958d447b Mon Sep 17 00:00:00 2001 From: Nigel Kersten Date: Thu, 23 Jul 2009 08:21:18 -0700 Subject: Update install.rb to cope with all OS X versions, not just 10.5 --- install.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'install.rb') diff --git a/install.rb b/install.rb index 3be8952..ec16c4b 100755 --- a/install.rb +++ b/install.rb @@ -205,13 +205,14 @@ def prepare_installation version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".") libdir = File.join(Config::CONFIG["libdir"], "ruby", version) - # Mac OS X 10.5 declares bindir and sbindir as + # Mac OS X 10.5 and higher declare bindir and sbindir as # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/sbin # which is not generally where people expect executables to be installed - if RUBY_PLATFORM == "universal-darwin9.0" - Config::CONFIG['bindir'] = "/usr/bin" - Config::CONFIG['sbindir'] = "/usr/sbin" + # These settings are appropriate defaults for all OS X versions. + if RUBY_PLATFORM =~ /^universal-darwin[\d\.]+$/ + Config::CONFIG['bindir'] = "/usr/bin" + Config::CONFIG['sbindir'] = "/usr/sbin" end if not InstallOptions.bindir.nil? -- cgit