Mercurial > hg > nginx
changeset 5180:2db6bdcaedc0
Configure: fixed perl Makefile generation (ticket #334).
Dependancy tracking introduced in r5169 were not handled absolute path
names properly. Absolute names might appear in CORE_DEPS if --with-openssl
or --with-pcre configure arguments are used to build OpenSSL/PCRE
libraries.
Additionally, revert part of r5169 to set NGX_INCS from Makefile
variables. Makefile variables have $ngx_include_opt in them, which
might result in wrong include paths being used. As a side effect,
this also restores build with --with-http_perl_module and --without-http
at the same time.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 19 Apr 2013 12:19:57 +0000 |
parents | b0a616778038 |
children | 4d0ac175f6e4 |
files | auto/lib/perl/make src/http/modules/perl/Makefile.PL |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/lib/perl/make Thu Apr 18 14:26:08 2013 +0000 +++ b/auto/lib/perl/make Fri Apr 19 12:19:57 2013 +0000 @@ -31,7 +31,7 @@ cd $NGX_OBJS/src/http/modules/perl \\ && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\ - NGX_INCS="\$(CORE_INCS) \$(HTTP_INCS)" \\ + NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \\ NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\ $NGX_PERL Makefile.PL \\ LIB=$NGX_PERL_MODULES \\
--- a/src/http/modules/perl/Makefile.PL Thu Apr 18 14:26:08 2013 +0000 +++ b/src/http/modules/perl/Makefile.PL Fri Apr 19 12:19:57 2013 +0000 @@ -22,7 +22,7 @@ depend => { 'nginx.c' => join(" ", map { - "../../../../../$_" + m#^/# ? $_ : "../../../../../$_" } (split(/\s+/, $ENV{NGX_DEPS}), "src/http/modules/perl/ngx_http_perl_module.h")) },