186526
/
openresty
mirror of https://github.com/openresty/openresty.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feature: --ngx_prefix for specific prefix for nginx

This commit is contained in:
rainingmaster 2020-07-30 15:33:11 +08:00
parent de3e659ef5
commit 5dc01d34b9
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/000-sanity.t
View File

@ -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.

15
util/configure vendored
View File

@ -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 = '';