Author: mdounin
Date: 2012-09-24 18:46:50 +0000 (Mon, 24 Sep 2012)
New Revision: 4851
URL: http://trac.nginx.org/nginx/changeset/4851/nginx

Log:
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.


Modified:
branches/stable-1.2/
branches/stable-1.2/auto/install
branches/stable-1.2/auto/lib/libatomic/make
branches/stable-1.2/auto/lib/perl/make

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2012-09-24 18:37:14 UTC (rev 4850)
+++ branches/stable-1.2 2012-09-24 18:46:50 UTC (rev 4851)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4783,4824,4830-4832,4834,4840,4843-4844
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4783,4824,4830-4832,4834,4840,4842-4844
\ No newline at end of property
Modified: branches/stable-1.2/auto/install
===================================================================
--- branches/stable-1.2/auto/install 2012-09-24 18:37:14 UTC (rev 4850)
+++ branches/stable-1.2/auto/install 2012-09-24 18:46:50 UTC (rev 4851)
@@ -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

Modified: branches/stable-1.2/auto/lib/libatomic/make
===================================================================
--- branches/stable-1.2/auto/lib/libatomic/make 2012-09-24 18:37:14 UTC (rev 4850)
+++ branches/stable-1.2/auto/lib/libatomic/make 2012-09-24 18:46:50 UTC (rev 4851)
@@ -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

Modified: branches/stable-1.2/auto/lib/perl/make
===================================================================
--- branches/stable-1.2/auto/lib/perl/make 2012-09-24 18:37:14 UTC (rev 4850)
+++ branches/stable-1.2/auto/lib/perl/make 2012-09-24 18:46:50 UTC (rev 4851)
@@ -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


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel