# HG changeset patch # User Maxim Dounin # Date 1348512410 0 # Node ID e74c39b69ebeabe057eb2f16f29301c20a71fbb8 # Parent 026ff0eb3062e10e62e5bbcfc703b9954f85a36f Merge of r4842: fixed make macros to use parentheses. Configure: fixed make macros to use parentheses instead of braces. Parentheses are more portable, in particular they are understood by nmake while braces aren't. diff -r 026ff0eb3062 -r e74c39b69ebe auto/install --- a/auto/install Mon Sep 24 18:37:14 2012 +0000 +++ b/auto/install Mon Sep 24 18:46:50 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 diff -r 026ff0eb3062 -r e74c39b69ebe auto/lib/libatomic/make --- a/auto/lib/libatomic/make Mon Sep 24 18:37:14 2012 +0000 +++ b/auto/lib/libatomic/make Mon Sep 24 18:46:50 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 diff -r 026ff0eb3062 -r e74c39b69ebe auto/lib/perl/make --- a/auto/lib/perl/make Mon Sep 24 18:37:14 2012 +0000 +++ b/auto/lib/perl/make Mon Sep 24 18:46:50 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