Signed-off-by: Nigel Kersten <[email protected]>
---
install.rb | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
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?
--
1.6.3.3
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
