Mercurial > hg > nginx

changeset 5168:482fda984556

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure: fixed nginx.so rebuild (broken by r5145). To avoid further breaks it's now done properly, all the dependencies are now passed to Makefile.PL. While here, fixed include list passed to Makefile.PL to use Makefile variables rather than a list expanded during configure.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 10 Apr 2013 17:07:44 +0000
parents 85ee9d858dcb
children f6bbe77794aa
files auto/lib/perl/make src/http/modules/perl/Makefile.PL
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/auto/lib/perl/make
+++ b/auto/lib/perl/make
@@ -31,7 +31,8 @@ cat << END                              
 
 	cd $NGX_OBJS/src/http/modules/perl \\
 		&& NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\
-			NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \\
+			NGX_INCS="\$(CORE_INCS) \$(HTTP_INCS)" \\
+			NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\
 		$NGX_PERL Makefile.PL \\
 			LIB=$NGX_PERL_MODULES \\
 			INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN
--- a/src/http/modules/perl/Makefile.PL
+++ b/src/http/modules/perl/Makefile.PL
@@ -21,8 +21,10 @@ WriteMakefile(
                          } (split /\s+/, $ENV{NGX_INCS})),
 
     depend => {
-        'nginx.c'     =>
-                  "../../../../../src/http/modules/perl/ngx_http_perl_module.h"
+        'nginx.c'     => join(" ", map {
+                             "../../../../../$_"
+                         } (split(/\s+/, $ENV{NGX_DEPS}),
+                            "src/http/modules/perl/ngx_http_perl_module.h"))
     },
 
     PM => {