From: Richard Levitte <levitte@openssl.org>
Date: Fri, 11 Oct 2002 08:45:42 +0000 (+0000)
Subject: Fix inconsistencies in the Darwin targets.
X-Git-Tag: OpenSSL_0_9_7-beta4~109^2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c199837c542ac45195253c38899c9fa4f4db00b7;p=thirdparty%2Fopenssl.git

Fix inconsistencies in the Darwin targets.
Add a variant of SHLIB_SOVER without the preceding period.
---

diff --git a/Makefile.shared b/Makefile.shared
index 9f8c33d288f..d5bafc339fd 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -64,6 +64,7 @@ CALC_VERSIONS=	\
 	if [ -n "$(LIBVERSION) $(LIBCOMPATVERSIONS)" ]; then \
 		prev=""; \
 		for v in `echo "$(LIBVERSION) $(LIBCOMPATVERSIONS)" | cut -d';' -f1`; do \
+			SHLIB_SOVER_NODOT=$$v \
 			SHLIB_SOVER=.$$v; \
 			if [ -n "$$prev" ]; then \
 				SHLIB_COMPAT=$$SHLIB_COMPAT .$$prev; \
@@ -133,17 +134,17 @@ link_o.darwin:
 	LIBDEPS="$(LIBDEPS)" \
 	ALLSYMSFLAGS='-all_load' \
 	NOALLSYMSFLAGS='' \
-	SHAREDFLAGS="-current_version $(LIBVERSION) -compatibility_version $$SHLIB_SOVER" \
+	SHAREDFLAGS="-dynamiclib -current_version $(LIBVERSION) -compatibility_version $$SHLIB_SOVER_NODOT" \
 	SHAREDCMD='$(CC)'; \
 	$(LINK_SO_O)
 link_a.darwin:
 	@ $(CALC_VERSIONS); \
-	SHLIB=lib$(LIBNAME)$$SHLIB_SOVER.dylib \
+	SHLIB=lib$(LIBNAME) \
 	SHLIB_SUFFIX=.dylib \
 	LIBDEPS="$(LIBDEPS)" \
 	ALLSYMSFLAGS='-all_load' \
 	NOALLSYMSFLAGS='' \
-	SHAREDFLAGS="-dynamiclib -current_version $(LIBVERSION) -compatibility_version $$SHLIB_SOVER" \
+	SHAREDFLAGS="-dynamiclib -current_version $(LIBVERSION) -compatibility_version $$SHLIB_SOVER_NODOT" \
 	SHAREDCMD='$(CC)'; \
 	$(LINK_SO_A)