summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2013-04-19 12:19:57 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2013-04-19 12:19:57 +0000
commit9d4e3c36123d4e796e3c630ee89ca958b5393d9e (patch)
treed6380218d296dc59e3fb02e8b40fcb7a6bc1c87d /src
parent43527828798a93d4d0678358d90b66d3d4612d97 (diff)
downloadnginx-9d4e3c36123d4e796e3c630ee89ca958b5393d9e.tar.gz
nginx-9d4e3c36123d4e796e3c630ee89ca958b5393d9e.tar.bz2
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.
Diffstat (limited to 'src')
-rw-r--r--src/http/modules/perl/Makefile.PL2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/modules/perl/Makefile.PL b/src/http/modules/perl/Makefile.PL
index ff8b2c634..03348b555 100644
--- a/src/http/modules/perl/Makefile.PL
+++ b/src/http/modules/perl/Makefile.PL
@@ -22,7 +22,7 @@ WriteMakefile(
depend => {
'nginx.c' => join(" ", map {
- "../../../../../$_"
+ m#^/# ? $_ : "../../../../../$_"
} (split(/\s+/, $ENV{NGX_DEPS}),
"src/http/modules/perl/ngx_http_perl_module.h"))
},