[nginx] svn commit: r5169 - in trunk: auto/lib/perl src/http/modules/perl

Author: mdounin
Date: 2013-04-10 17:07:44 +0000 (Wed, 10 Apr 2013)
New Revision: 5169
URL: http://trac.nginx.org/nginx/changeset/5169/nginx

Log:
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.


Modified:
trunk/auto/lib/perl/make
trunk/src/http/modules/perl/Makefile.PL

Modified: trunk/auto/lib/perl/make
===================================================================
--- trunk/auto/lib/perl/make 2013-04-04 14:19:06 UTC (rev 5168)
+++ trunk/auto/lib/perl/make 2013-04-10 17:07:44 UTC (rev 5169)
@@ -31,7 +31,8 @@

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

Modified: trunk/src/http/modules/perl/Makefile.PL
===================================================================
--- trunk/src/http/modules/perl/Makefile.PL 2013-04-04 14:19:06 UTC (rev 5168)
+++ trunk/src/http/modules/perl/Makefile.PL 2013-04-10 17:07:44 UTC (rev 5169)
@@ -21,8 +21,10 @@
} (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 => {

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel