Cygwin/mingw sync with stable.

diff --git a/Makefile.org b/Makefile.org
index a6f59dd9e551514c519bd13731760c8d40c4a56d..daed6711c1bd06e087986043e4747e31713e1341 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -501,7 +501,7 @@ install_docs:
        @pod2man="`cd util; ./pod2mantest $(PERL)`"; \
        here="`pwd`"; \
        filecase=; \
-       if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" ]; then \
+       if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
                filecase=-i; \
        fi; \
        set -e; for i in doc/apps/*.pod; do \

diff --git a/Makefile.shared b/Makefile.shared
index afa421f3174cd89778f67e357eca8f5aa17bdc59..4f909704623f311d0db6320b1e257934d55a12fb 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -260,9 +260,14 @@ link_a.cygwin:
        SHLIB_SOVER=; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="$(CFLAGS) -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
+       base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x61200000; \
+       SHAREDFLAGS="$(CFLAGS) $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
        SHAREDCMD='${CC}'; \
-       $(LINK_SO_A)
+       [ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
+       [ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
+       $(LINK_SO_A) || exit 1; \
+       cp -p $$SHLIB$$SHLIB_SUFFIX apps/; \
+       cp -p $$SHLIB$$SHLIB_SUFFIX test/
 link_app.cygwin:
        LDCMD=$(CC);\
        LDFLAGS="$(CFLAGS)"; \