From 94c1672ef0c469bbed4c470a7c8c449836e6041b Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Sat, 30 Apr 2005 23:45:53 +0000
Subject: [PATCH] Cygwin/mingw sync with stable.

---
 Makefile.org    | 2 +-
 Makefile.shared | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile.org b/Makefile.org
index a6f59dd9e5..daed6711c1 100644
--- 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 afa421f317..4f90970462 100644
--- 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)"; \
-- 
2.34.1