diff options
author | Nigel Kersten <nigelk@google.com> | 2009-07-23 08:21:18 -0700 |
---|---|---|
committer | Paul Nasrat <pnasrat@googlemail.com> | 2009-08-07 11:03:56 +0100 |
commit | f3ad66f69979cd107025b6edd07bbe6c958d447b (patch) | |
tree | 2bb03a516259484b9cdd9a8c4c5b5f0c861342f3 /install.rb | |
parent | 8191322766b19a5e3b2bc01cf6e14112fbd57031 (diff) | |
download | facter-f3ad66f69979cd107025b6edd07bbe6c958d447b.tar.gz facter-f3ad66f69979cd107025b6edd07bbe6c958d447b.tar.xz facter-f3ad66f69979cd107025b6edd07bbe6c958d447b.zip |
Update install.rb to cope with all OS X versions, not just 10.5
Diffstat (limited to 'install.rb')
-rwxr-xr-x | install.rb | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -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? |