Mercurial > hg > nginx
annotate 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 |
| rev | line source |
|---|---|
| 599 | 1 |
| 2 # Copyright (C) Igor Sysoev | |
| 4412 | 3 # Copyright (C) Nginx, Inc. |
| 599 | 4 |
| 5 | |
|
5146
f45b83d20cfb
Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents:
5145
diff
changeset
|
6 v=`grep 'define NGINX_VERSION' src/core/nginx.h | sed -e 's/^.*"\(.*\)".*/\1/'` |
|
f45b83d20cfb
Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents:
5145
diff
changeset
|
7 |
|
f45b83d20cfb
Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents:
5145
diff
changeset
|
8 |
| 599 | 9 cat << END >> $NGX_MAKEFILE |
| 10 | |
|
5145
f6777aef5b2f
Configure: fixed perl module make rules.
Ruslan Ermilov <ru@nginx.com>
parents:
5144
diff
changeset
|
11 $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.$ngx_perl_dlext: \\ |
|
5143
6dd4875eb526
Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents:
5070
diff
changeset
|
12 \$(CORE_DEPS) \$(HTTP_DEPS) \\ |
|
6dd4875eb526
Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents:
5070
diff
changeset
|
13 src/http/modules/perl/ngx_http_perl_module.h \\ |
| 599 | 14 $NGX_OBJS/src/http/modules/perl/Makefile |
|
4841
95ce3172493e
Configure: fixed make macros to use parentheses instead of braces.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4740
diff
changeset
|
15 cd $NGX_OBJS/src/http/modules/perl && \$(MAKE) |
| 599 | 16 |
|
740
5187a63d9fca
force perl modules reinstallation after rebuilding
Igor Sysoev <igor@sysoev.ru>
parents:
681
diff
changeset
|
17 rm -rf $NGX_OBJS/install_perl |
|
5187a63d9fca
force perl modules reinstallation after rebuilding
Igor Sysoev <igor@sysoev.ru>
parents:
681
diff
changeset
|
18 |
| 599 | 19 |
|
5143
6dd4875eb526
Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents:
5070
diff
changeset
|
20 $NGX_OBJS/src/http/modules/perl/Makefile: \\ |
|
5146
f45b83d20cfb
Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents:
5145
diff
changeset
|
21 src/core/nginx.h \\ |
|
5143
6dd4875eb526
Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents:
5070
diff
changeset
|
22 src/http/modules/perl/Makefile.PL \\ |
|
5144
273754fad787
Configure: improved make dependencies for perl module.
Ruslan Ermilov <ru@nginx.com>
parents:
5143
diff
changeset
|
23 src/http/modules/perl/nginx.pm \\ |
|
273754fad787
Configure: improved make dependencies for perl module.
Ruslan Ermilov <ru@nginx.com>
parents:
5143
diff
changeset
|
24 src/http/modules/perl/nginx.xs \\ |
|
273754fad787
Configure: improved make dependencies for perl module.
Ruslan Ermilov <ru@nginx.com>
parents:
5143
diff
changeset
|
25 src/http/modules/perl/typemap |
|
5146
f45b83d20cfb
Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents:
5145
diff
changeset
|
26 sed "s/%%VERSION%%/$v/" src/http/modules/perl/nginx.pm > \\ |
|
f45b83d20cfb
Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents:
5145
diff
changeset
|
27 $NGX_OBJS/src/http/modules/perl/nginx.pm |
|
f45b83d20cfb
Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents:
5145
diff
changeset
|
28 cp -p src/http/modules/perl/nginx.xs $NGX_OBJS/src/http/modules/perl/ |
| 599 | 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/ | |
| 31 | |
|
5143
6dd4875eb526
Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents:
5070
diff
changeset
|
32 cd $NGX_OBJS/src/http/modules/perl \\ |
|
6dd4875eb526
Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents:
5070
diff
changeset
|
33 && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\ |
|
5180
2db6bdcaedc0
Configure: fixed perl Makefile generation (ticket #334).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5168
diff
changeset
|
34 NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \\ |
|
5168
482fda984556
Configure: fixed nginx.so rebuild (broken by r5145).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5146
diff
changeset
|
35 NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\ |
|
5143
6dd4875eb526
Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents:
5070
diff
changeset
|
36 $NGX_PERL Makefile.PL \\ |
|
6dd4875eb526
Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents:
5070
diff
changeset
|
37 LIB=$NGX_PERL_MODULES \\ |
|
950
9581fba9ea12
fix for nginx.pm default installation
Igor Sysoev <igor@sysoev.ru>
parents:
948
diff
changeset
|
38 INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN |
| 599 | 39 |
| 40 END |