Commit ae26ee34 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Updated zlib version in build files.

parent 992bee50

docs/INSTALL

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ Win32 
   adjust as necessary. It is also possible to override these paths with

   environment variables, for example:



     set ZLIB_PATH=c:\zlib-1.2.7

     set ZLIB_PATH=c:\zlib-1.2.8

     set OPENSSL_PATH=c:\openssl-0.9.8y

     set LIBSSH2_PATH=c:\libssh2-1.4.3
@@ -323,7 +323,7 @@ Win32 
   documentation on how to compile zlib. Define the ZLIB_PATH environment

   variable to the location of zlib.h and zlib.lib, for example:



     set ZLIB_PATH=c:\zlib-1.2.7

     set ZLIB_PATH=c:\zlib-1.2.8



   Then run 'nmake vc-zlib' in curl's root directory.

docs/examples/Makefile.m32

+2 −2
Original line number Diff line number Diff line
@@ -27,14 +27,14 @@ 
## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn

##

## Hint: you can also set environment vars to control the build, f.e.:

## set ZLIB_PATH=c:/zlib-1.2.7

## set ZLIB_PATH=c:/zlib-1.2.8

## set ZLIB=1

#

###########################################################################



# Edit the path below to point to the base of your Zlib sources.

ifndef ZLIB_PATH

ZLIB_PATH = ../../../zlib-1.2.7

ZLIB_PATH = ../../../zlib-1.2.8

endif

# Edit the path below to point to the base of your OpenSSL package.

ifndef OPENSSL_PATH

docs/examples/Makefile.netware

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ endif 


# Edit the path below to point to the base of your Zlib sources.

ifndef ZLIB_PATH

ZLIB_PATH = ../../../zlib-1.2.7

ZLIB_PATH = ../../../zlib-1.2.8

endif



# Edit the path below to point to the base of your OpenSSL package.

lib/Makefile.Watcom

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ CFLAGS += -dWANT_IDN_PROTOTYPES 
!ifdef %zlib_root

ZLIB_ROOT = $(%zlib_root)

!else

ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.7

ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.8

!endif



!ifdef %libssh2_root

lib/Makefile.b32

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\.. 


# Edit the path below to point to the base of your Zlib sources.

!ifndef ZLIB_PATH

ZLIB_PATH = ..\..\zlib-1.2.7

ZLIB_PATH = ..\..\zlib-1.2.8

!endif



# Edit the path below to point to the base of your OpenSSL package.