From c63b826d8b01922d9b239b9242b1585c773e81bd Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Wed, 10 Apr 2013 17:07:44 +0000 Subject: [PATCH] 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. --- auto/lib/perl/make | 3 ++- src/http/modules/perl/Makefile.PL | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/auto/lib/perl/make b/auto/lib/perl/make index 825ffe7da..9c5e826e8 100644 --- 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 78a1e516b..ff8b2c634 100644 --- 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 => {