From 5dc01d34b97cfb69a95f491cbfc959a9becaca19 Mon Sep 17 00:00:00 2001
From: rainingmaster <312841925@qq.com>
Date: Thu, 30 Jul 2020 15:33:11 +0800
Subject: [PATCH] feature: --ngx_prefix for specific prefix for nginx

---
 t/000-sanity.t | 12 ++++++------
 util/configure | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/t/000-sanity.t b/t/000-sanity.t
index 450a737..101a6ad 100644
--- a/t/000-sanity.t
+++ b/t/000-sanity.t
@@ -1401,7 +1401,7 @@ install: all
 clean:
 	rm -rf build *.exe *.dll openresty-*
 --- err
-Can't exec "gcc-4.2": No such file or directory at ./configure line 719.
+Can't exec "gcc-4.2": No such file or directory at ./configure line 724.
 
 
 
@@ -1579,7 +1579,7 @@ install: all
 clean:
 	rm -rf build *.exe *.dll openresty-*
 --- err
-Can't exec "cl": No such file or directory at ./configure line 719.
+Can't exec "cl": No such file or directory at ./configure line 724.
 
 
 
@@ -2323,8 +2323,8 @@ install: all
 clean:
 	rm -rf build *.exe *.dll openresty-*
 --- err
-Can't exec "sw_vers": No such file or directory at ./configure line 793.
-Use of uninitialized value $v in scalar chomp at ./configure line 794.
+Can't exec "sw_vers": No such file or directory at ./configure line 798.
+Use of uninitialized value $v in scalar chomp at ./configure line 799.
 
 
 
@@ -2413,8 +2413,8 @@ install: all
 clean:
 	rm -rf build *.exe *.dll openresty-*
 --- err
-Can't exec "sw_vers": No such file or directory at ./configure line 793.
-Use of uninitialized value $v in scalar chomp at ./configure line 794.
+Can't exec "sw_vers": No such file or directory at ./configure line 798.
+Use of uninitialized value $v in scalar chomp at ./configure line 799.
 
 
 
diff --git a/util/configure b/util/configure
index d461294..5ac8690 100755
--- a/util/configure
+++ b/util/configure
@@ -124,6 +124,7 @@ my $with_resty_mods_regex;
 }
 
 my $prefix = '/usr/local/openresty';
+my $ngx_prefix;
 my $ngx_sbin;
 my %resty_opts;
 my $dry_run;
@@ -172,6 +173,9 @@ for my $opt (@ARGV) {
             $prefix = '.';
         }
 
+    } elsif ($opt =~ /^--ngx-prefix=(.*)/) {
+        $ngx_prefix = $1;
+
     } elsif ($opt eq '--without-lua51') {
         die "ERROR: --without-lua51 is no longer supported.\n";
 
@@ -381,11 +385,12 @@ if ($platform eq 'msys') {
 
 print "platform: $platform ($OS)\n";
 
-my $ngx_prefix;
-if ($platform eq 'msys') {
-    $ngx_prefix = "$prefix";
-} else {
-    $ngx_prefix = "$prefix/nginx";
+if (!$ngx_prefix) {
+    if ($platform eq 'msys') {
+        $ngx_prefix = "$prefix";
+    } else {
+        $ngx_prefix = "$prefix/nginx";
+    }
 }
 
 my $postamble = '';