Configurations/unix-Makefile.tmpl: don't count on -E -P.

[openssl.git] / Makefile.shared

diff --git a/Makefile.shared b/Makefile.shared
index 2617fbf4aac49624b7384c7e99ed602ef611a077..65980b293f7d81cc29a5a1f39cadaa5324278e21 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -171,7 +171,7 @@ DO_GNU_DSO=\
        $(DO_GNU_SO_COMMON)
 DO_GNU_SO=\
        $(CALC_VERSIONS); \
-       SHLIB=lib$$SHLIB; \
+       SHLIB=lib$(LIBNAME).so; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
        $(DO_GNU_SO_COMMON)
@@ -360,7 +360,7 @@ link_dso.solaris:
                $(DO_GNU_DSO); \
        else \
                $(CALC_VERSIONS); \
-               SHLIB=lib$(LIBNAME).so; \
+               SHLIB=$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
                ALLSYMSFLAGS=""; \
                NOALLSYMSFLAGS=""; \
@@ -489,7 +489,7 @@ link_app.irix:
 link_dso.hpux:
        @if $(DETECT_GNU_LD); then $(DO_GNU_DSO); else \
        SHLIB=$(LIBNAME).sl; \
-       expr "$(CFLAGS)" : '.*DSO_DLFCN' > /dev/null && SHLIB=lib$(LIBNAME).so; \
+       expr "$(CFLAGS)" : '.*DSO_DLFCN' > /dev/null && SHLIB=$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
        ALLSYMSFLAGS=''; \
        NOALLSYMSFLAGS=''; \
@@ -561,10 +561,11 @@ symlink.hpux:
 symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
 
 # Compatibility targets
-link_dso.bsd-gcc-shared link_dso.linux-shared link_dso.gnu-shared: link_dso.gnu
-link_shlib.bsd-gcc-shared link_shlib.gnu-shared: link_shlib.gnu
-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
+link_dso.bsd-gcc-shared link_dso.linux-shared link_dso.gnu-shared link_dso.haiku-shared: link_dso.gnu
+link_shlib.bsd-gcc-shared: link_shlib.linux-shared
+link_shlib.gnu-shared link_shlib.haiku-shared: link_shlib.gnu
+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu
+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu
 link_dso.bsd-shared: link_dso.bsd
 link_shlib.bsd-shared: link_shlib.bsd
 link_app.bsd-shared: link_app.bsd