summaryrefslogtreecommitdiffhomepage
path: root/misc
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2022-06-22 18:34:58 +0400
committerSergey Kandaurov <pluknet@nginx.com>2022-06-22 18:34:58 +0400
commitc64e2ec1e94974193c286b63db4f58e6e499f5cb (patch)
tree144428623b095d53c37fbecd31b0026a321dfec6 /misc
parent854e41fec24e1f292ec5a951e7bfc9377afc0905 (diff)
parent1009f5586ccf07375595675227d296815d91b2f2 (diff)
downloadnginx-c64e2ec1e94974193c286b63db4f58e6e499f5cb.tar.gz
nginx-c64e2ec1e94974193c286b63db4f58e6e499f5cb.tar.bz2
Merged with the default branch.
Diffstat (limited to 'misc')
-rw-r--r--misc/GNUmakefile10
1 files changed, 2 insertions, 8 deletions
diff --git a/misc/GNUmakefile b/misc/GNUmakefile
index 58e9f7f00..dfb5b9b62 100644
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -6,8 +6,8 @@ TEMP = tmp
CC = cl
OBJS = objs.msvc8
-OPENSSL = openssl-1.1.1m
-ZLIB = zlib-1.2.11
+OPENSSL = openssl-1.1.1p
+ZLIB = zlib-1.2.12
PCRE = pcre2-10.39
@@ -15,12 +15,6 @@ release: export
mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX)
- # delete incomplete sources
- rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c
- rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c
- rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
- rm -r $(TEMP)/$(NGINX)/src/os/win32
-
mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)