Index: lib/Makefile.vc6
===================================================================
--- lib/Makefile.vc6	(revision 124)
+++ lib/Makefile.vc6	(working copy)
@@ -62,6 +62,14 @@
 ZLIB_PATH  = ../../zlib-1.2.3
 !ENDIF
 
+!IFNDEF ZLIB_INC_PATH
+ZLIB_INC_PATH = ${ZLIB_PATH}
+!ENDIF
+
+!IFNDEF ZLIB_LIB_PATH
+ZLIB_LIB_PATH = ${ZLIB_PATH}
+!ENDIF
+
 !IFNDEF MACHINE
 MACHINE  = X86
 !ENDIF
@@ -92,7 +100,7 @@
 CCNODBG    = cl.exe /O2 /DNDEBUG
 CCDEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /GZ
 CFLAGSSSL  = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
-CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
+CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_INC_PATH)"
 CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL
 CFLAGSLIB  = /DCURL_STATICLIB
 LNKDLL     = link.exe /DLL
@@ -101,6 +109,7 @@
 SSLLIBS    = libeay32.lib ssleay32.lib
 ZLIBLIBSDLL= zdll.lib
 ZLIBLIBS   = zlib.lib
+ZLIBDBGLIBS = zlibd.lib
 WINLIBS    = wsock32.lib wldap32.lib
 CFLAGS     = $(CFLAGS)
 
@@ -139,7 +148,7 @@
 !IF "$(CFG)" == "release-zlib"
 TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
 LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
 CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)
 CFGSET   = TRUE
@@ -188,7 +197,7 @@
 TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
 LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
 CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)
 CFGSET   = TRUE
@@ -213,7 +222,7 @@
 !IF "$(CFG)" == "release-zlib-dll"
 TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
 LNK      = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
 CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)
 CFGSET   = TRUE
@@ -225,7 +234,7 @@
 !IF "$(CFG)" == "release-ssl-dll-zlib-dll"
 TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"
 LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
 CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)
@@ -238,7 +247,7 @@
 !IF "$(CFG)" == "release-dll-zlib-dll"
 TARGET   = $(LIB_NAME).dll
 DIROBJ   = $(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
 LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib
 CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB)
 CFGSET   = TRUE
@@ -251,7 +260,7 @@
 !IF "$(CFG)" == "release-dll-ssl-dll-zlib-dll"
 TARGET   = $(LIB_NAME).dll
 DIROBJ   = $(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"
 LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib
 CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB)
@@ -288,8 +297,8 @@
 !IF "$(CFG)" == "debug-zlib"
 TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
-LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
+LNK      = $(LNKLIB) $(ZLIBDBGLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
 CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSZLIB) $(CFLAGSLIB)
 CFGSET   = TRUE
 !ENDIF
@@ -312,9 +321,9 @@
 !IF "$(CFG)" == "debug-ssl-zlib"
 TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"
-LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
+LNK      = $(LNKLIB) $(ZLIBDBGLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
 CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)
 CFGSET   = TRUE
 !ENDIF
@@ -325,7 +334,7 @@
 !IF "$(CFG)" == "debug-zlib-dll"
 TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
 LNK      = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
 CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSZLIB) $(CFLAGSLIB)
 CFGSET   = TRUE
@@ -337,7 +346,7 @@
 !IF "$(CFG)" == "debug-ssl-dll-zlib-dll"
 TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"
 LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
 CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)
@@ -375,7 +384,7 @@
 !IF "$(CFG)" == "debug-dll-zlib-dll"
 TARGET   = $(LIB_NAME_DEBUG).dll
 DIROBJ   = $(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
 LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb
 CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSZLIB)
 CFGSET   = TRUE
@@ -388,7 +397,7 @@
 !IF "$(CFG)" == "debug-dll-ssl-dll-zlib-dll"
 TARGET   = $(LIB_NAME_DEBUG).dll
 DIROBJ   = $(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_LIB_PATH)"
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"
 LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb
 CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB)
Index: src/Makefile.vc6
===================================================================
--- src/Makefile.vc6	(revision 124)
+++ src/Makefile.vc6	(working copy)
@@ -19,6 +19,14 @@
 ZLIB_PATH = ../../zlib-1.2.3
 !ENDIF
 
+!IFNDEF ZLIB_INC_PATH
+ZLIB_INC_PATH = ${ZLIB_PATH}
+!ENDIF
+
+!IFNDEF ZLIB_LIB_PATH
+ZLIB_LIB_PATH = ${ZLIB_PATH}
+!ENDIF
+
 !IFNDEF OPENSSL_PATH
 OPENSSL_PATH = ../../openssl-0.9.8g
 !ENDIF
@@ -49,9 +57,10 @@
 
 ########################################################
 ## Nothing more to do below this line!
-ZLIB_CFLAGS   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
-ZLIB_LFLAGS   = "/LIBPATH:$(ZLIB_PATH)"
+ZLIB_CFLAGS   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_INC_PATH)"
+ZLIB_LFLAGS   = "/LIBPATH:$(ZLIB_LIB_PATH)"
 ZLIB_LIBS     = zlib.lib
+ZLIB_DBG_LIBS = zlibd.lib
 ZLIB_IMP_LIBS = zdll.lib
 
 SSL_CFLAGS     = /DUSE_SSLEAY
@@ -140,7 +149,7 @@
 !IF "$(CFG)" == "release-zlib"
 CFLAGS         = $(CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
 LINKLIBS       = libcurl.lib  $(ZLIB_LIBS)
-LINKLIBS_DEBUG = libcurld.lib $(ZLIB_LIBS)
+LINKLIBS_DEBUG = libcurld.lib $(ZLIB_DBG_LIBS)
 LFLAGS         = $(LFLAGS) $(ZLIB_LFLAGS)
 !ENDIF
 
@@ -170,7 +179,7 @@
 !IF "$(CFG)" == "release-ssl-zlib"
 CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
 LINKLIBS       = libcurl.lib  $(SSL_LIBS) $(ZLIB_LIBS)
-LINKLIBS_DEBUG = libcurld.lib $(SSL_LIBS) $(ZLIB_LIBS)
+LINKLIBS_DEBUG = libcurld.lib $(SSL_LIBS) $(ZLIB_DBG_LIBS)
 LFLAGS         = $(LFLAGS) $(SSL_LFLAGS) $(ZLIB_LFLAGS)
 !ENDIF