--- a/src/zlib.mk	Thu Jun 20 17:21:08 2013 -0400
+++ b/src/zlib.mk	Fri Jun 21 09:42:47 2013 -0400
@@ -18,10 +18,14 @@
 
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    cd '$(1)' && CC='$(MXE_CC)' ./configure \
       --prefix='$(HOST_PREFIX)'
 
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)' -j '$(JOBS)'
+
+    if [ "$(BUILD_STATIC)" = yes ]; then \
+      $(MAKE) -C '$(1)' -j '$(JOBS)' install; \
+    fi
 
     if [ "$(BUILD_SHARED)" = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/libz.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \

--- a/tools/make-shared-from-static	Thu Jun 20 17:21:08 2013 -0400
+++ b/tools/make-shared-from-static	Fri Jun 21 09:42:47 2013 -0400
@@ -148,7 +148,11 @@
 NM=nm
 SED=sed
 global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[	 ][	 ]*_\\([_A-Za-z][_A-iZa-z0-9]*\\)\\{0,1\\}\$/\\1 _\\2 \\2/p' | sed '/ __gnu_lto/d'"
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED -e '/^[BCDGRS][ ]/s/.*[ ]\\\\([^ ]*\\\\)/\\\\1,DATA/' | \$SED -e '/^[AITW][ ]/s/.*[ ]//' | sort | uniq >> \$export_symbols"
+# Ignore DATA symbols for now. They should be be properly exported from
+# the source code using dllexport. They can't be re-exported manually like
+# this using MSVC.
+#export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED -e '/^[BCDGRS][ ]/s/.*[ ]\\\\([^ ]*\\\\)/\\\\1,DATA/' | \$SED -e '/^[AITW][ ]/s/.*[ ]//' | sort | uniq >> \$export_symbols"
+export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED -e '/^[BCDGRS][ ]/d' | \$SED -e '/^[AITW][ ]/s/.*[ ]//' | sort | uniq >> \$export_symbols"
 
 mkdir $tmpdir