--- Rakefile.~1~	2009-05-19 11:48:28.236986307 +0200
+++ Rakefile	2009-05-19 11:50:53.000000000 +0200
@@ -38,11 +38,7 @@
 
 CXX = "g++"
 LIBEXT = PlatformInfo.library_extension
-if OPTIMIZE
-	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS"
-else
-	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
-end
+OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG"
 
 # Extra compiler flags that should always be passed to the C/C++ compiler.
 # Should be included last in the command string.
@@ -733,15 +729,15 @@
 task :fakeroot => [:apache2, :native_support, :doc] do
 	require 'rbconfig'
 	include Config
-	fakeroot = "pkg/fakeroot"
+	fakeroot = ENV['DISTDIR']
 
 	# We don't use CONFIG['archdir'] and the like because we want
 	# the files to be installed to /usr, and the Ruby interpreter
 	# on the packaging machine might be in /usr/local.
-	libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
+  libdir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}"
 	extdir = "#{libdir}/#{CONFIG['arch']}"
 	bindir = "#{fakeroot}/usr/bin"
-	docdir = "#{fakeroot}/usr/share/doc/phusion_passenger"
+  docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}"
 	libexecdir = "#{fakeroot}/usr/lib/phusion_passenger"
 	
 	sh "rm -rf #{fakeroot}"
@@ -757,7 +753,6 @@
 	sh "cp bin/* #{bindir}/"
 	
 	sh "mkdir -p #{libexecdir}"
-	sh "cp ext/apache2/mod_passenger.so #{libexecdir}/"
 	sh "mv #{fakeroot}/usr/bin/passenger-spawn-server #{libexecdir}/"
 	sh "cp ext/apache2/ApplicationPoolServerExecutable #{libexecdir}/"