Skip to content

Commit 5e4bdad

Browse files
committed
Fix install
1 parent 432b336 commit 5e4bdad

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

passenger.diff

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/bin/passenger-install-nginx-module b/bin/passenger-install-nginx-module
2-
index 07762dcf..b4faa74b 100755
2+
index 07762dcf..969ad958 100755
33
--- a/bin/passenger-install-nginx-module
44
+++ b/bin/passenger-install-nginx-module
55
@@ -109,6 +109,7 @@ def run_steps
@@ -10,6 +10,15 @@ index 07762dcf..b4faa74b 100755
1010
if pcre_is_installed?
1111
@pcre_source_dir = nil
1212
else
13+
@@ -133,7 +134,7 @@ def run_steps
14+
check_whether_other_nginx_installations_exist(nginx_prefix)
15+
extra_nginx_configure_flags = ask_for_extra_nginx_configure_flags(nginx_prefix)
16+
end
17+
- check_whether_we_can_write_to(nginx_prefix) || exit(1)
18+
+ no_make_install || check_whether_we_can_write_to(nginx_prefix) || exit(1)
19+
nginx_config_already_exists_before_installing = nginx_config_exists?(nginx_prefix)
20+
if needs_compiling_support_files?
21+
if !compile_passenger_support_files
1322
@@ -141,8 +142,8 @@ def run_steps
1423
exit(1)
1524
end

0 commit comments

Comments
 (0)