Fix problems introduced by the recent renames.

Rakefile

@@ -31,7 +31,7 @@ verbose true
 ##### Configuration
 
 # Don't forget to edit Configuration.h too
-PACKAGE_VERSION = Passenger::VERSION_STRING
+PACKAGE_VERSION = PhusionPassenger::VERSION_STRING
 OPTIMIZE = ["yes", "on", "true"].include?(ENV['OPTIMIZE'])
 
 include PlatformInfo

bin/passenger-install-apache2-module

@@ -55,7 +55,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 	end
 
 	def install!
-		if Passenger.natively_packaged?
+		if PhusionPassenger.natively_packaged?
 			check_dependencies || exit(1)
 			show_apache2_config_snippets
 			show_deployment_example
@@ -78,7 +78,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 
 private
 	def show_welcome_screen
-		render_template 'apache2/welcome', :version => Passenger::VERSION_STRING
+		render_template 'apache2/welcome', :version => PhusionPassenger::VERSION_STRING
 		wait
 	end
 
@@ -142,7 +142,7 @@ private
 	def show_apache2_config_snippets
 		puts
 		line
-		if Passenger.natively_packaged?
+		if PhusionPassenger.natively_packaged?
 			module_location = "#{PASSENGER_ROOT}/lib/passenger/mod_passenger.so"
 		else
 			module_location = "#{PASSENGER_ROOT}/ext/apache2/mod_passenger.so"
@@ -151,7 +151,7 @@ private
 			:module_location => module_location,
 			:passenger_root => PASSENGER_ROOT,
 			:ruby => RUBY
-		if Passenger.natively_packaged?
+		if PhusionPassenger.natively_packaged?
 			wait(10)
 		else
 			wait

bin/passenger-install-nginx-module

@@ -8,13 +8,13 @@ $LOAD_PATH.unshift("#{PASSENGER_ROOT}/ext")
 
 require 'optparse'
 require 'fileutils'
-require 'passenger/platform_info'
-require 'passenger/dependencies'
-require 'passenger/abstract_installer'
+require 'phusion_passenger/platform_info'
+require 'phusion_passenger/dependencies'
+require 'phusion_passenger/abstract_installer'
 include PlatformInfo
 
-class Installer < Passenger::AbstractInstaller
-	include Passenger
+class Installer < PhusionPassenger::AbstractInstaller
+	include PhusionPassenger
 
 	NGINX_VERSION = "0.6.34"
 
@@ -37,7 +37,7 @@ class Installer < Passenger::AbstractInstaller
 
 		check_write_permission_to_passenger_root || exit(1)
 
-		compile_passenger_support_files
+		compile_passenger_support_files || exit(1)
 
 		download_and_install = should_we_download_and_install_nginx_automatically?
 		if pcre_is_installed?
@@ -97,9 +97,7 @@ private
 	def compile_passenger_support_files
 		new_screen
 		color_puts "<banner>Compiling Passenger support files...</banner>"
-		if !sh("rake nginx")
-			return false
-		end
+		return sh("rake nginx")
 	end
 
 	def should_we_download_and_install_nginx_automatically?

lib/phusion_passenger/abstract_installer.rb

@@ -16,19 +16,19 @@
 #  with this program; if not, write to the Free Software Foundation, Inc.,
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'passenger/console_text_template'
-require 'passenger/version'
+require 'phusion_passenger/console_text_template'
+require 'phusion_passenger/version'
 
-module Passenger
+module PhusionPassenger
 
 # Abstract base class for installers. Used by passenger-install-apache2-module
 # and passenger-install-nginx-module.
 class AbstractInstaller
 	PASSENGER_WEBSITE = "http://www.modrails.com/"
 	PHUSION_WEBSITE = "www.phusion.nl"
 	USERS_GUIDE = begin
-		if Passenger.natively_packaged?
-			"/usr/share/doc/passenger/Users guide.html"
+		if PhusionPassenger.natively_packaged?
+			"/usr/share/doc/phusion_passenger/Users guide.html"
 		else
 			File.expand_path("#{LIBDIR}/../../doc/Users guide.html")
 		end
@@ -194,4 +194,4 @@ def print_dependency_installation_instructions(dep)
 	end
 end
 
-end # module Passenger
+end # module PhusionPassenger

lib/phusion_passenger/version.rb

@@ -16,12 +16,12 @@
 #  with this program; if not, write to the Free Software Foundation, Inc.,
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-module Passenger
+module PhusionPassenger
 	LIBDIR = File.expand_path(File.dirname(__FILE__))
 
 	VERSION_STRING = '2.1.0'
 
 	def self.natively_packaged?
 		return !File.exist?("#{LIBDIR}/../../Rakefile")
 	end
-end
+end