Mercurial > hg > nginx
comparison misc/GNUmakefile @ 3594:8a5106c2a377 stable-0.7
merge r3489, r3493:
*) MSVC8 compatibility with OpenSSL 1.0.0
*) fix building OpenSSL-1.0.0 on 64-bit Linux:
make installs the libraries in lib64 directory
and build nginx/Windows against OpenSSL-0.9.8n
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 07 Jun 2010 11:55:20 +0000 |
| parents | c7fe4b9118d2 |
| children | c93b1c05436c |
comparison
equal
deleted
inserted
replaced
| 3593:a79d2ad7a2d8 | 3594:8a5106c2a377 |
|---|---|
| 3 | sed -e 's/^.*\"\(.*\)\"/\1/') | 3 | sed -e 's/^.*\"\(.*\)\"/\1/') |
| 4 NGINX = nginx-$(VER) | 4 NGINX = nginx-$(VER) |
| 5 TEMP = tmp | 5 TEMP = tmp |
| 6 | 6 |
| 7 OBJS = objs.msvc8 | 7 OBJS = objs.msvc8 |
| 8 OPENSSL = openssl-0.9.8k | 8 OPENSSL = openssl-0.9.8n |
| 9 ZLIB = zlib-1.2.3 | 9 ZLIB = zlib-1.2.3 |
| 10 PCRE = pcre-7.9 | 10 PCRE = pcre-7.9 |
| 11 | 11 |
| 12 | 12 |
| 13 release: | 13 release: |