diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-07-21 12:33:23 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-07-22 09:25:26 +0200 |
| commit | 82c78ee480346f6a2e88a7fa4964ab090b0d8b69 (patch) | |
| tree | 9a8c761e1415c65435539bca8a5c6d43cf2ed719 /Configurations/descrip.mms.tmpl | |
| parent | 11279b13f586441a8fcc5109ee1907f33eb0cc24 (diff) | |
| download | openssl-82c78ee480346f6a2e88a7fa4964ab090b0d8b69.tar.gz | |
VMS: Rearrange installation targets for shared libraries
The way it was implemented before this change, the shared libraries
were installed twice. On a file system that supports file
generations, that's a waste. Slightly rearranging the install targets
solves the problem.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations/descrip.mms.tmpl')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index bf1f248558..89930972a8 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -353,9 +353,13 @@ descrip.mms : FORCE # Install helper targets ############################################# -install_sw : all install_dev install_engines install_runtime install_startup install_ivp +install_sw : all install_shared _install_dev_ns - + install_engines _install_runtime_ns - + install_startup install_ivp -uninstall_sw : uninstall_dev uninstall_engines uninstall_runtime uninstall_startup uninstall_ivp +uninstall_sw : uninstall_shared _uninstall_dev_ns - + uninstall_engines _uninstall_runtime_ns - + uninstall_startup uninstall_ivp install_docs : install_html_docs @@ -374,7 +378,17 @@ install_ssldirs : check_INSTALLTOP COPY/PROT=W:RE {- sourcefile("apps", "openssl-vms.cnf") -} - ossl_dataroot:[000000]openssl.cnf -install_dev : check_INSTALLTOP +install_shared : check_INSTALLTOP + @ {- output_off() if $disabled{shared}; "" -} ! + @ WRITE SYS$OUTPUT "*** Installing shareable images" + @ ! Install shared (runtime) libraries + - CREATE/DIR ossl_installroot:[LIB.'arch'] + {- join("\n ", + map { "COPY/PROT=W:R $_.EXE ossl_installroot:[LIB.'arch']" } + @install_shlibs) -} + @ {- output_on() if $disabled{shared}; "" -} ! + +_install_dev_ns : check_INSTALLTOP @ WRITE SYS$OUTPUT "*** Installing development files" @ ! Install header files - CREATE/DIR ossl_installroot:[include.openssl] @@ -384,22 +398,10 @@ install_dev : check_INSTALLTOP {- join("\n ", map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" } @{$unified_info{install}->{libraries}}) -} - @ {- output_off() if $disabled{shared}; "" -} ! - @ ! Install shared (runtime) libraries - {- join("\n ", - map { "COPY/PROT=W:R $_.EXE ossl_installroot:[LIB.'arch']" } - @install_shlibs) -} - @ {- output_on() if $disabled{shared}; "" -} ! -install_runtime : check_INSTALLTOP - @ ! {- output_off() if $disabled{apps}; "" -} - @ WRITE SYS$OUTPUT "*** Installing runtime files" - @ {- output_off() if $disabled{shared}; "" -} ! - @ ! Install shared (runtime) libraries - {- join("\n ", - map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" } - @install_shlibs) -} - @ {- output_on() if $disabled{shared}; "" -} ! +install_dev : install_shared _install_dev_ns + +_install_runtime_ns : check_INSTALLTOP @ ! Install the main program - CREATE/DIR ossl_installroot:[EXE.'arch'] COPY/PROT=W:RE [.APPS]openssl.EXE - @@ -408,6 +410,8 @@ install_runtime : check_INSTALLTOP COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE] @ ! {- output_on() if $disabled{apps}; "" -} +install_runtime : install_shared _install_runtime_ns + install_engines : check_INSTALLTOP @ {- output_off() unless scalar @{$unified_info{engines}}; "" -} ! @ WRITE SYS$OUTPUT "*** Installing engines" |