diff options
| author | Nigel Kersten <nigel@explanatorygap.net> | 2008-04-24 21:28:36 -0700 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-04-30 10:40:43 -0500 |
| commit | 5a2bbad8b7239d64ffa4ad51ab1a68d4926c6a72 (patch) | |
| tree | 97bb0c07b3f4bec7320ec0f1271ceaa1727c190c /install.rb | |
| parent | fff6ad90d781b8fda2b93916a67ef65b3b263c66 (diff) | |
| download | puppet-5a2bbad8b7239d64ffa4ad51ab1a68d4926c6a72.tar.gz puppet-5a2bbad8b7239d64ffa4ad51ab1a68d4926c6a72.tar.xz puppet-5a2bbad8b7239d64ffa4ad51ab1a68d4926c6a72.zip | |
fix bindir/sbindir defaults on OS X 10.5
Diffstat (limited to 'install.rb')
| -rwxr-xr-x | install.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/install.rb b/install.rb index 087c3c860..70922cc98 100755 --- a/install.rb +++ b/install.rb @@ -200,6 +200,15 @@ def prepare_installation end end + # Mac OS X 10.5 declares 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" + end + if (destdir = ENV['DESTDIR']) bindir = "#{destdir}#{Config::CONFIG['bindir']}" sbindir = "#{destdir}#{Config::CONFIG['sbindir']}" |