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.
This commit is contained in:
Maxim Dounin 2013-04-10 17:07:44 +00:00
parent e297091c28
commit c63b826d8b
2 changed files with 6 additions and 3 deletions

View File

@ -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

View File

@ -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 => {