Mercurial > hg > nginx
comparison auto/lib/perl/make @ 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 | 9f17e765a21e |
comparison
equal
deleted
inserted
replaced
5179:b0a616778038 | 5180:2db6bdcaedc0 |
---|---|
29 cp -p src/http/modules/perl/typemap $NGX_OBJS/src/http/modules/perl/ | 29 cp -p src/http/modules/perl/typemap $NGX_OBJS/src/http/modules/perl/ |
30 cp -p src/http/modules/perl/Makefile.PL $NGX_OBJS/src/http/modules/perl/ | 30 cp -p src/http/modules/perl/Makefile.PL $NGX_OBJS/src/http/modules/perl/ |
31 | 31 |
32 cd $NGX_OBJS/src/http/modules/perl \\ | 32 cd $NGX_OBJS/src/http/modules/perl \\ |
33 && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\ | 33 && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\ |
34 NGX_INCS="\$(CORE_INCS) \$(HTTP_INCS)" \\ | 34 NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \\ |
35 NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\ | 35 NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\ |
36 $NGX_PERL Makefile.PL \\ | 36 $NGX_PERL Makefile.PL \\ |
37 LIB=$NGX_PERL_MODULES \\ | 37 LIB=$NGX_PERL_MODULES \\ |
38 INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN | 38 INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN |
39 | 39 |