[nginx] svn commit: r4791 - in branches/stable-1.2: . auto auto/lib/libatomic auto/lib/perl

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-08-06 15:47:15 +0000 (Mon, 06 Aug 2012)
New Revision: 4791
URL: http://trac.nginx.org/nginx/changeset/4791/nginx

Log:
Merge of r4741: fixed "make" used instead of "${MAKE}".


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-08-06 15:45:44 UTC (rev 4790)
+++ branches/stable-1.2	2012-08-06 15:47:15 UTC (rev 4791)

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-4738,4740
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741
\ No newline at end of property
Modified: branches/stable-1.2/auto/install
===================================================================
--- branches/stable-1.2/auto/install	2012-08-06 15:45:44 UTC (rev 4790)
+++ branches/stable-1.2/auto/install	2012-08-06 15:47:15 UTC (rev 4791)
@@ -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-08-06 15:45:44 UTC (rev 4790)
+++ branches/stable-1.2/auto/lib/libatomic/make	2012-08-06 15:47:15 UTC (rev 4791)
@@ -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-08-06 15:45:44 UTC (rev 4790)
+++ branches/stable-1.2/auto/lib/perl/make	2012-08-06 15:47:15 UTC (rev 4791)
@@ -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