fixed error checking order.
This commit is contained in:
parent
824c7a4617
commit
50e6dd5079
|
@ -187,7 +187,4 @@ cd nginx-0.8.54
|
||||||
--- err
|
--- err
|
||||||
--with-http_ssl_module conflicts with --without-http_ssl_module
|
--with-http_ssl_module conflicts with --without-http_ssl_module
|
||||||
--- out
|
--- out
|
||||||
cp -r bundle/ build/
|
|
||||||
cd build
|
|
||||||
cd nginx-0.8.54
|
|
||||||
|
|
||||||
|
|
|
@ -108,6 +108,14 @@ for my $opt (@ARGV) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
my $ngx_prefix = "$prefix/nginx";
|
||||||
|
|
||||||
|
my $cmd = "./configure --prefix=$ngx_prefix"
|
||||||
|
. " --with-ld-opt='-Wl,-rpath=$ngx_prefix/lib'"
|
||||||
|
. build_resty_opts(\%resty_opts)
|
||||||
|
. (@ngx_opts ? " " . join(" ", @ngx_opts) : "");
|
||||||
|
;
|
||||||
|
|
||||||
if (-d 'build') {
|
if (-d 'build') {
|
||||||
system("rm -rf build");
|
system("rm -rf build");
|
||||||
}
|
}
|
||||||
|
@ -124,14 +132,6 @@ my $ngx_dir = auto_complete "nginx";
|
||||||
|
|
||||||
cd $ngx_dir;
|
cd $ngx_dir;
|
||||||
|
|
||||||
my $ngx_prefix = "$prefix/nginx";
|
|
||||||
|
|
||||||
my $cmd = "./configure --prefix=$ngx_prefix"
|
|
||||||
. " --with-ld-opt='-Wl,-rpath=$ngx_prefix/lib'"
|
|
||||||
. build_resty_opts(\%resty_opts)
|
|
||||||
. (@ngx_opts ? " " . join(" ", @ngx_opts) : "");
|
|
||||||
;
|
|
||||||
|
|
||||||
if ($dry_run) {
|
if ($dry_run) {
|
||||||
print "$cmd\n";
|
print "$cmd\n";
|
||||||
exit 0;
|
exit 0;
|
||||||
|
|
Loading…
Reference in New Issue