186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

bugfix: we did not use PATH in ./configure --sbin-path=PATH when creating symlinks.

Browse Source 
this fixes #196.

Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
This commit is contained in:
David Galeano
2016-09-14 09:38:00 +01:00
committed by Yichun Zhang (agentzh)
parent 7a5c96d72f
commit ee90152ae3
2 changed files with 170 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
util/configure vendored
View File

@ -121,6 +121,7 @@ my $with_resty_mods_regex;
}
my $prefix = '/usr/local/openresty';
my $ngx_sbin;
my %resty_opts;
my $dry_run;
my @ngx_rpaths;
@ -304,6 +305,10 @@ for my $opt (@ARGV) {
$path = File::Spec->rel2abs($path);
push @ngx_opts, "--with-$lib=$path";
} elsif ($opt =~ /^--sbin-path=(.*)/) {
$ngx_sbin = $1;
push @ngx_opts, $opt;
} elsif ($opt =~ /^--\w.*/) {
push @ngx_opts, $opt;
@ -354,7 +359,10 @@ push @make_install_cmds,
. " \$(DESTDIR)$prefix/site/manifest";
if ($platform ne 'msys') {
push @make_install_cmds, "ln -sf $ngx_prefix/sbin/nginx \$(DESTDIR)$prefix/bin/openresty";
if (!$ngx_sbin) {
$ngx_sbin = "$ngx_prefix/sbin/nginx";
}
push @make_install_cmds, "ln -sf $ngx_sbin \$(DESTDIR)$prefix/bin/openresty";
}
cd '../..'; # to the root