diff --git a/docs/INSTALL b/docs/INSTALL index c13a660942ec9006362d41fdee01cfa7cff9001c..9e3c226a4ef7a77d70e10dbce0587760d5e1b48b 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -221,7 +221,7 @@ Win32 environment variables, for example: set ZLIB_PATH=c:\zlib-1.2.7 - set OPENSSL_PATH=c:\openssl-0.9.8x + set OPENSSL_PATH=c:\openssl-0.9.8y set LIBSSH2_PATH=c:\libssh2-1.4.3 ATTENTION: if you want to build with libssh2 support you have to use latest @@ -337,7 +337,7 @@ Win32 Before running nmake define the OPENSSL_PATH environment variable with the root/base directory of OpenSSL, for example: - set OPENSSL_PATH=c:\openssl-0.9.8x + set OPENSSL_PATH=c:\openssl-0.9.8y Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root directory. 'nmake vc-ssl' will create a libcurl static and dynamic diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32 index 4e93093d608c3828ae83ac60235972aaf38de766..10ad698ade2fcefacefaed601e669bb16bb669b9 100644 --- a/docs/examples/Makefile.m32 +++ b/docs/examples/Makefile.m32 @@ -38,7 +38,7 @@ ZLIB_PATH = ../../../zlib-1.2.7 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../../openssl-0.9.8x +OPENSSL_PATH = ../../../openssl-0.9.8y endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH diff --git a/docs/examples/Makefile.netware b/docs/examples/Makefile.netware index e1a48b7d553034390727699530ed588430bf587d..44fde7e999ecab55158e3ac134167452be4056f5 100644 --- a/docs/examples/Makefile.netware +++ b/docs/examples/Makefile.netware @@ -19,7 +19,7 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../../openssl-0.9.8x +OPENSSL_PATH = ../../../openssl-0.9.8y endif # Edit the path below to point to the base of your LibSSH2 package. diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index c5e05523c25dc7ff0505b3e70182bbe3bd43bc69..ff991dc31199c23a4e80f7a7c26ed738f42ff447 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -101,7 +101,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3 !ifdef %openssl_root OPENSSL_ROOT = $(%openssl_root) !else -OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8x +OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8y !endif !ifdef %ares_root diff --git a/lib/Makefile.b32 b/lib/Makefile.b32 index c71f651b50f6c4afc8ecaca6e647b612a3fc4aaf..fbd584fb6c2a6987d063ad06614d8183244c779c 100644 --- a/lib/Makefile.b32 +++ b/lib/Makefile.b32 @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.7 # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8x +OPENSSL_PATH = ..\..\openssl-0.9.8y !endif # Set libcurl static lib, dll and import lib diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 0a69a877f0347cd9f83f865be19d623d2bcb9c87..1de5af893a7118b6ba16b117c506fa4c2eda98e4 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.7 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8x +OPENSSL_PATH = ../../openssl-0.9.8y endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 4b5cf34a5a15b2c1a4235c75d04ba5c363ce115a..cd87c8d184a1bbc03306f0bdb21a7e78f2af519c 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -19,7 +19,7 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8x +OPENSSL_PATH = ../../openssl-0.9.8y endif # Edit the path below to point to the base of your LibSSH2 package. diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 34fb30c7f3e0beee81cbd64650162b807c7c4ced..acd9f7facb75d56c96cee6bfc0ff21d15d585cae 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -65,7 +65,7 @@ !INCLUDE ..\winbuild\Makefile.msvc.names !IFNDEF OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8x +OPENSSL_PATH = ../../openssl-0.9.8y !ENDIF !IFNDEF LIBSSH2_PATH diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks index 4d2aaa0b819b477dc080d4c4a835061f7e78c444..0860df8e7bcb754f5abbbb1ab93c8295e6b2222b 100644 --- a/lib/Makefile.vxworks +++ b/lib/Makefile.vxworks @@ -33,8 +33,8 @@ BUILD_TYPE := debug USER_CFLAGS:= # directories where to seek for includes and libraries -OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8x-vxWorks6.3/include -OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8x-vxWorks6.3 +OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8y-vxWorks6.3/include +OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8y-vxWorks6.3 ZLIB_INC := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/zlib-1.2.7 ZLIB_LIB := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib ARES_INC := diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index a65924e1b55c0148b348eebc8418b3d9fa437572..761ceb5153e06aa1ff3cc66ca27c8fc63a973505 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -90,7 +90,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3 !ifdef %openssl_root OPENSSL_ROOT = $(%openssl_root) !else -OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8x +OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8y !endif !ifdef %ares_root diff --git a/src/Makefile.b32 b/src/Makefile.b32 index 31d89f6e2f531918e7808436f849b3228e85018c..4622868ab1cc16e319ad176cc678936990b9ab0c 100644 --- a/src/Makefile.b32 +++ b/src/Makefile.b32 @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.7 # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8x +OPENSSL_PATH = ..\..\openssl-0.9.8y !endif # Set program's name diff --git a/src/Makefile.m32 b/src/Makefile.m32 index b56e206ca4e2d841c6621447226a1c4d68f9a72e..891a000a590a963c3c3d129673cf6c4991ecf380 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.7 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8x +OPENSSL_PATH = ../../openssl-0.9.8y endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH diff --git a/src/Makefile.netware b/src/Makefile.netware index 82d24b94c3db941c6f2964532313ab0f5998f3a1..2b252c908511fb35ed36f6be0faae728a379ec6b 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -19,7 +19,7 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8x +OPENSSL_PATH = ../../openssl-0.9.8y endif # Edit the path below to point to the base of your LibSSH2 package. diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index 4a23c98cc008e539072bb27fa60d928d5e91b760..02665c9e24b89aa75b5865193dd69cc35b4a21f4 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -56,7 +56,7 @@ PROGRAM_NAME = curl.exe !IFNDEF OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8x +OPENSSL_PATH = ../../openssl-0.9.8y !ENDIF !IFNDEF ZLIB_PATH