diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-08-06 15:47:15 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-08-06 15:47:15 +0000 |
| commit | 1c1cccf6732d5cd7335923d6b9ef3f47722dbd7c (patch) | |
| tree | cd5199606110fa9009c16b0fcc87d25476cef15d | |
| parent | b3f5ddf8759204813627083c33ae4b41d2751c33 (diff) | |
| download | nginx-1c1cccf6732d5cd7335923d6b9ef3f47722dbd7c.tar.gz nginx-1c1cccf6732d5cd7335923d6b9ef3f47722dbd7c.tar.bz2 | |
Merge of r4741: fixed "make" used instead of "${MAKE}".
| -rw-r--r-- | auto/install | 2 | ||||
| -rw-r--r-- | auto/lib/libatomic/make | 2 | ||||
| -rw-r--r-- | auto/lib/perl/make | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/auto/install b/auto/install index c2c0ade59..6ef0da9df 100644 --- a/auto/install +++ b/auto/install @@ -8,7 +8,7 @@ if [ $USE_PERL = YES ]; then 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 diff --git a/auto/lib/libatomic/make b/auto/lib/libatomic/make index b84267b63..f3cd83281 100644 --- a/auto/lib/libatomic/make +++ b/auto/lib/libatomic/make @@ -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 diff --git a/auto/lib/perl/make b/auto/lib/perl/make index b4df01dd9..248be9e3f 100644 --- a/auto/lib/perl/make +++ b/auto/lib/perl/make @@ -12,7 +12,7 @@ $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.so: \ $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 |