Mercurial > hg > nginx
changeset 4790:f033afb9d3f0 stable-1.2
Merge of r4741: fixed "make" used instead of "${MAKE}".
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 06 Aug 2012 15:47:15 +0000 |
parents | 179a4d4073b3 |
children | e1d4956d7e91 |
files | auto/install auto/lib/libatomic/make auto/lib/perl/make |
diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/install Mon Aug 06 15:45:44 2012 +0000 +++ b/auto/install Mon Aug 06 15:47:15 2012 +0000 @@ -8,7 +8,7 @@ cat << END >> $NGX_MAKEFILE install_perl_modules: - cd $NGX_OBJS/src/http/modules/perl && make install + cd $NGX_OBJS/src/http/modules/perl && \${MAKE} install END NGX_INSTALL_PERL_MODULES=install_perl_modules
--- a/auto/lib/libatomic/make Mon Aug 06 15:45:44 2012 +0000 +++ b/auto/lib/libatomic/make Mon Aug 06 15:47:15 2012 +0000 @@ -6,7 +6,7 @@ cat << END >> $NGX_MAKEFILE $NGX_LIBATOMIC/src/libatomic_ops.a: $NGX_LIBATOMIC/Makefile - cd $NGX_LIBATOMIC && make + cd $NGX_LIBATOMIC && \${MAKE} $NGX_LIBATOMIC/Makefile: $NGX_MAKEFILE cd $NGX_LIBATOMIC && ./configure
--- a/auto/lib/perl/make Mon Aug 06 15:45:44 2012 +0000 +++ b/auto/lib/perl/make Mon Aug 06 15:47:15 2012 +0000 @@ -12,7 +12,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile cp -p src/http/modules/perl/nginx.* $NGX_OBJS/src/http/modules/perl/ - cd $NGX_OBJS/src/http/modules/perl && make + cd $NGX_OBJS/src/http/modules/perl && \${MAKE} rm -rf $NGX_OBJS/install_perl