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.

diff --git a/auto/lib/perl/make b/auto/lib/perl/make
index 825ffe7da6afd32e0792e03a5b5b85a4464adc54..9c5e826e8a14bb41fb137b40b408bab66dd4d917 100644 (file)
--- a/auto/lib/perl/make
+++ b/auto/lib/perl/make
@@ -31,7 +31,8 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \\
 
        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

diff --git a/src/http/modules/perl/Makefile.PL b/src/http/modules/perl/Makefile.PL
index 78a1e516bf7c7ed6d887fa170615d277d4cc54cc..ff8b2c63451a3da7527fe8af8cf5bba8223bb783 100644 (file)
--- 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 => {