feature: --ngx_prefix for specific prefix for nginx

pull/642/head
rainingmaster 5 years ago
parent de3e659ef5
commit 5dc01d34b9

@ -1401,7 +1401,7 @@ install: all
clean: clean:
rm -rf build *.exe *.dll openresty-* rm -rf build *.exe *.dll openresty-*
--- err --- 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: clean:
rm -rf build *.exe *.dll openresty-* rm -rf build *.exe *.dll openresty-*
--- err --- 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: clean:
rm -rf build *.exe *.dll openresty-* rm -rf build *.exe *.dll openresty-*
--- err --- err
Can't exec "sw_vers": No such file or directory at ./configure line 793. 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 794. Use of uninitialized value $v in scalar chomp at ./configure line 799.
@ -2413,8 +2413,8 @@ install: all
clean: clean:
rm -rf build *.exe *.dll openresty-* rm -rf build *.exe *.dll openresty-*
--- err --- err
Can't exec "sw_vers": No such file or directory at ./configure line 793. 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 794. Use of uninitialized value $v in scalar chomp at ./configure line 799.

15
util/configure vendored

@ -124,6 +124,7 @@ my $with_resty_mods_regex;
} }
my $prefix = '/usr/local/openresty'; my $prefix = '/usr/local/openresty';
my $ngx_prefix;
my $ngx_sbin; my $ngx_sbin;
my %resty_opts; my %resty_opts;
my $dry_run; my $dry_run;
@ -172,6 +173,9 @@ for my $opt (@ARGV) {
$prefix = '.'; $prefix = '.';
} }
} elsif ($opt =~ /^--ngx-prefix=(.*)/) {
$ngx_prefix = $1;
} elsif ($opt eq '--without-lua51') { } elsif ($opt eq '--without-lua51') {
die "ERROR: --without-lua51 is no longer supported.\n"; die "ERROR: --without-lua51 is no longer supported.\n";
@ -381,11 +385,12 @@ if ($platform eq 'msys') {
print "platform: $platform ($OS)\n"; print "platform: $platform ($OS)\n";
my $ngx_prefix; if (!$ngx_prefix) {
if ($platform eq 'msys') { if ($platform eq 'msys') {
$ngx_prefix = "$prefix"; $ngx_prefix = "$prefix";
} else { } else {
$ngx_prefix = "$prefix/nginx"; $ngx_prefix = "$prefix/nginx";
}
} }
my $postamble = ''; my $postamble = '';

Loading…
Cancel
Save