diff options
author | Richard Levitte <levitte@openssl.org> | 2016-10-28 23:35:37 +0200 |
---|---|---|
committer | Richard Levitte <richard@levitte.org> | 2016-11-01 00:52:26 +0100 |
commit | 32ee80362c2e79ca47b02bd2cd4f22259bf66798 (patch) | |
tree | 837db82bfe69f740de6aa97895955e507977a820 | |
parent | 936503cb0bc9c3bc08a070e0fc43bb112b1e9d02 (diff) |
HPUX: Add the forgotten $(DSTDIR) when linking DSOs
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1802)
(cherry picked from commit f46661de7806b5bae507d17185bda2bafd6c20d8)
-rw-r--r-- | Makefile.shared | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.shared b/Makefile.shared index e82ed1d956..098e1ec6f2 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -497,8 +497,8 @@ link_dso.hpux: expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \ fi; \ - rm -f $$SHLIB$$SHLIB_SUFFIX || :; \ - $(LINK_SO_DSO) && chmod a=rx $$SHLIB$$SHLIB_SUFFIX + rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SUFFIX || :; \ + $(LINK_SO_DSO) && chmod a=rx $(DSTDIR)/$$SHLIB$$SHLIB_SUFFIX link_shlib.hpux: @if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \ $(CALC_VERSIONS); \ @@ -510,8 +510,8 @@ link_shlib.hpux: expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \ fi; \ - rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \ - $(LINK_SO_SHLIB) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX + rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \ + $(LINK_SO_SHLIB) && chmod a=rx $(DSTDIR)/$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX link_app.hpux: @if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \ LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,+s,+cdp,../:,+cdp,./:"; \ |