diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-12-10 16:56:39 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-12-14 11:48:39 +0000 |
| commit | 71a78784e8f000703267276b2f87d055bfa0e00e (patch) | |
| tree | 1975543f190559d78d446dbb76ffe3b8a4fac58c /Configurations | |
| parent | fe27680fc6395f661f3949e9e1ef0a83e499e87b (diff) | |
Fix VMS installation - Override the openssl logical name in descrip.mms.tmpl
This was part of 0cbb6f6a9ac5aa3ff813ef2e5afe6e443708ee20, but was
incomplete in that commit.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16842)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 55d0c34275..c819733765 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -429,7 +429,9 @@ NODEBUG=@ $(NODEBUG) ! them, so we create it instead. This is an unfortunate $(NODEBUG) ! necessity. $(NODEBUG) ! - $(NODEBUG) DEFINE openssl "{- sourcedir('include/openssl') -} + $(NODEBUG) openssl_inc1 = F$PARSE("[.include.openssl]","A.;",,,"syntax_only") - "A.;" + $(NODEBUG) openssl_inc2 = F$PARSE("sourcetop:[include.openssl]","A.;",,,"SYNTAX_ONLY") - "A.;" + $(NODEBUG) DEFINE openssl 'openssl_inc1','openssl_inc2' $(NODEBUG) ! $(NODEBUG) ! Figure out the architecture $(NODEBUG) ! @@ -442,9 +444,10 @@ NODEBUG=@ .LAST : $(NODEBUG) {- join("\n\t\$(NODEBUG) ", map { "DEASSIGN ".uc($_) } @shlibs) || "!" -} + $(NODEBUG) DEASSIGN openssl $(NODEBUG) DEASSIGN ossl_dataroot $(NODEBUG) DEASSIGN ossl_installroot - $(NODEBUG) DEASSIGN openssl + $(NODEBUG) DEASSIGN ossl_sourceroot .DEFAULT : @ ! MMS cannot handle no actions... @@ -610,7 +613,9 @@ install_dev : check_INSTALLTOP install_runtime_libs @ WRITE SYS$OUTPUT "*** Installing development files" @ ! Install header files - CREATE/DIR ossl_installroot:[include.openssl] - COPY/PROT=W:R openssl:*.h ossl_installroot:[include.openssl] + COPY/PROT=W:R ossl_sourceroot:[include.openssl]*.h - + ossl_installroot:[include.openssl] + COPY/PROT=W:R [.include.openssl]*.h ossl_installroot:[include.openssl] @ ! Install static (development) libraries - CREATE/DIR ossl_installroot:[LIB.'arch'] {- join("\n ", |