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

feature: we bundle the resty-cli project to include its "resty" tool instead of using our own.

Browse Source
This commit is contained in:
Yichun Zhang (agentzh)
2014-12-29 14:49:08 -08:00
parent b70fdea626
commit 03b25469c8
4 changed files with 14 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/configure vendored
View File

@ -312,8 +312,6 @@ push @make_cmds, "cd $root_dir/build/$ngx_dir && "
push @make_install_cmds, "cd $root_dir/build/$ngx_dir && "
. "\$(MAKE) install DESTDIR=\$(DESTDIR)";
push @make_install_cmds, "cd $root_dir/build && ./install resty \$(DESTDIR)/$prefix/bin/";
cd '../..'; # to the root
#die "pwd: " .. `pwd`;
@ -844,6 +842,12 @@ _EOC_
}
}
# configure resty-cli:
my $resty_cli_dir = auto_complete 'resty-cli';
push @make_install_cmds, "cd $root_dir/build/$resty_cli_dir && "
. "$root_dir/build/install resty \$(DESTDIR)/$prefix/bin/";
# prepare nginx configure line
$ngx_dir = auto_complete "nginx";