synchronize with 0.9.7-stable version of this file

[openssl.git] / Makefile.shared

diff --git a/Makefile.shared b/Makefile.shared
index 9f8c33d288f26bcc56b3d793806c3ac1481f8640..ddc5bcc604b3df859db11b9f685e673ed31e5754 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -61,9 +61,10 @@ top:
 
 CALC_VERSIONS= \
        SHLIB_COMPAT=; SHLIB_SOVER=; \
-       if [ -n "$(LIBVERSION) $(LIBCOMPATVERSIONS)" ]; then \
+       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; \
@@ -79,14 +80,19 @@ LINK_SO=    \
        $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \
   $(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp )
 SYMLINK_SO=    \
+       prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
        if [ -n "$$SHLIB_COMPAT"]; then \
-               prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
                for x in $$SHLIB_COMPAT; do \
                        ( $(DEBUG); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
                          ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
                        prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
                done; \
+       fi; \
+       if [ -n "$$SHLIB_SOVER" ]; then \
+               ( $(DEBUG); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+                 ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
        fi
+
 LINK_SO_A=     SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO)
 LINK_SO_O=     SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO)
 LINK_SO_A_VIA_O=       \
@@ -133,17 +139,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)