Mercurial > hg > nginx
comparison src/http/modules/perl/Makefile.PL @ 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 | 482fda984556 |
| children | 0d2956dfc4e6 |
comparison
equal
deleted
inserted
replaced
| 5179:b0a616778038 | 5180:2db6bdcaedc0 |
|---|---|
| 20 m#^/# ? "-I $_" : "-I ../../../../../$_" | 20 m#^/# ? "-I $_" : "-I ../../../../../$_" |
| 21 } (split /\s+/, $ENV{NGX_INCS})), | 21 } (split /\s+/, $ENV{NGX_INCS})), |
| 22 | 22 |
| 23 depend => { | 23 depend => { |
| 24 'nginx.c' => join(" ", map { | 24 'nginx.c' => join(" ", map { |
| 25 "../../../../../$_" | 25 m#^/# ? $_ : "../../../../../$_" |
| 26 } (split(/\s+/, $ENV{NGX_DEPS}), | 26 } (split(/\s+/, $ENV{NGX_DEPS}), |
| 27 "src/http/modules/perl/ngx_http_perl_module.h")) | 27 "src/http/modules/perl/ngx_http_perl_module.h")) |
| 28 }, | 28 }, |
| 29 | 29 |
| 30 PM => { | 30 PM => { |