fix Windows "make install" workflow + linking to static zlib for MSVC

qt

@@ -1 +1 @@
-Subproject commit 61988292fe59c099f875251b443a34352074487f
+Subproject commit c4c1d4aa94a34059f561aee4764afd10dfcff921

scripts/build.py

@@ -219,7 +219,7 @@ DEPENDENT_LIBS = {
                 'result': {
                     'include/zlib.h' : 'zlib.h',
                     'include/zconf.h': 'zconf.h',
-                    'lib/zdll.lib'   : 'zlib.lib'
+                    'lib/zlib.lib'   : 'zlib.lib'
                 },
                 'replace':  [('win32/Makefile.msc', '-MD', '%(cflags)s')],
                 'commands': ['nmake /f win32/Makefile.msc zlib.lib']
@@ -250,7 +250,7 @@ DEPENDENT_LIBS = {
                 },
                 'replace': [
                     ('scripts/makefile.vcwin32', '-I..\\zlib', '-I..\\deplibs\\include'),
-                    ('scripts/makefile.vcwin32', '..\\zlib\\zlib.lib', '..\\deplibs\\lib\\zdll.lib'),
+                    ('scripts/makefile.vcwin32', '..\\zlib\\zlib.lib', '..\\deplibs\\lib\\zlib.lib'),
                     ('scripts/makefile.vcwin32', '-MD', '%(cflags)s')],
                 'commands': ['nmake /f scripts/makefile.vcwin32 libpng.lib']
             },

src/lib/lib.pro

@@ -31,13 +31,11 @@ headers.path=$$INSTALLBASE/include/wkhtmltox
 QMAKE_EXTRA_TARGETS += headers
 INSTALLS += headers
 
-windows {
-   TARGET_EXT=.dll
-}
+windows: CONFIG += skip_target_version_ext
 
 TARGET=wkhtmltox
 INSTALLS += target
-wkhtmltox.path=$$INSTALLBASE/lib
 
 DESTDIR = ../../bin
-target.path=$$INSTALLBASE/lib
+!windows: target.path=$$INSTALLBASE/lib
+else:     target.path=$$INSTALLBASE/bin