Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	spec/integration/defaults.rb
	spec/integration/node/catalog.rb
	spec/unit/rails.rb
	spec/unit/type/mount.rb

1 files changed, 10 insertions, 1 deletions

diff --git a/install.rb b/install.rb
index d744f2d2d..c32c24245 100755
--- a/install.rb
+++ b/install.rb
@@ -106,7 +106,7 @@ def do_man(man, strip = 'man/')
     File.install(mf, omf, 0644, true)
     gzip = %x{which gzip}
     gzip.chomp!
-    %x{#{gzip} #{omf}}
+    %x{#{gzip} -f #{omf}}
   end
 end
 
@@ -210,6 +210,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']}"