Mercurial > hg > nginx
annotate auto/lib/perl/make @ 4512:cbed47593ce0 stable-1.0
Merge of r4474, r4493: configure/build fixes.
*) Fixed build with embedded perl and --with-openssl.
*) Configure: moved icc detection before gcc. New versions of icc
confuse auto/cc/name due to introduced handling of a "icc -v".
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 05 Mar 2012 12:58:10 +0000 |
| parents | 4919fb357a5d |
| children | 432428be692d |
| rev | line source |
|---|---|
| 599 | 1 |
| 2 # Copyright (C) Igor Sysoev | |
|
4450
4919fb357a5d
Merge of r4406, r4413: copyrights updated.
Maxim Dounin <mdounin@mdounin.ru>
parents:
1187
diff
changeset
|
3 # Copyright (C) Nginx, Inc. |
| 599 | 4 |
| 5 | |
| 6 cat << END >> $NGX_MAKEFILE | |
| 7 | |
| 8 $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.so: \ | |
| 9 src/http/modules/perl/nginx.pm \ | |
| 10 src/http/modules/perl/nginx.xs \ | |
| 11 src/http/modules/perl/ngx_http_perl_module.h \ | |
| 12 $NGX_OBJS/src/http/modules/perl/Makefile | |
| 13 cp -p src/http/modules/perl/nginx.* $NGX_OBJS/src/http/modules/perl/ | |
| 14 | |
| 15 cd $NGX_OBJS/src/http/modules/perl && make | |
| 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 |
| 601 | 20 $NGX_OBJS/src/http/modules/perl/Makefile: \ |
| 21 src/http/modules/perl/Makefile.PL \ | |
| 22 src/http/modules/perl/nginx.pm | |
| 599 | 23 cp -p src/http/modules/perl/nginx.* $NGX_OBJS/src/http/modules/perl/ |
| 24 cp -p src/http/modules/perl/typemap $NGX_OBJS/src/http/modules/perl/ | |
| 25 cp -p src/http/modules/perl/Makefile.PL $NGX_OBJS/src/http/modules/perl/ | |
| 26 | |
| 27 cd $NGX_OBJS/src/http/modules/perl \ | |
| 681 | 28 && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \ |
| 599 | 29 NGX_PCRE=$PCRE \ |
| 30 NGX_OBJS=$NGX_OBJS \ | |
|
4512
cbed47593ce0
Merge of r4474, r4493: configure/build fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
31 NGX_OPENSSL=$OPENSSL \ |
| 599 | 32 $NGX_PERL Makefile.PL \ |
|
948
12077affd903
backout the r945: the nginx.pm could not be loaded at all,
Igor Sysoev <igor@sysoev.ru>
parents:
944
diff
changeset
|
33 LIB=$NGX_PERL_MODULES \ |
|
950
9581fba9ea12
fix for nginx.pm default installation
Igor Sysoev <igor@sysoev.ru>
parents:
948
diff
changeset
|
34 INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN |
| 599 | 35 |
| 36 END |