The branch master has been updated
via dac494d2a83ee38b59961d787f621b741e5b8aad (commit)
from f4e175e4afe900bce8624882c42d25056fd74188 (commit)
- Log -----------------------------------------------------------------
commit dac494d2a83ee38b59961d787f621b741e5b8aad
Author: Richard Levitte <[email protected]>
Date: Sat Feb 13 09:35:02 2016 +0100
In templates, output_on() must be used the same way as output_off()
Otherwise, there will be an unbalance.
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 4 ++--
Configurations/unix-Makefile.tmpl | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index ef745ed..1c5f58a 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -290,7 +290,7 @@ install_dev : check_INSTALLTOP
map { "COPY/PROT=W:RE $_.EXE ossl_installroot:['arch'.LIB]" }
map { $unified_info{sharednames}->{$_} || () }
@{$unified_info{libraries}}) -}
- @ {- output_on() -} !
+ @ {- output_on() if $config{no_shared}; "" -} !
install_runtime : check_INSTALLTOP
@ WRITE SYS$OUTPUT "*** Installing runtime files"
@@ -310,7 +310,7 @@ install_engines : check_INSTALLTOP
@ WRITE SYS$OUTPUT "*** Installing engines"
CREATE/DIR ossl_installroot:['arch'.ENGINES]
COPY/PROT=W:RE [.ENGINES]*.EXE ossl_installroot:['arch'.ENGINES]
- @ {- output_on() -} !
+ @ {- output_on() if $config{no_shared}; "" -} !
install_config : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -
check_INSTALLTOP
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index c649d3d..d416c21 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -235,9 +235,9 @@ install_dev:
chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a.new; \
mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a.new \
$(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a; \
- : {- output_on() -}; \
+ : {- output_on() unless windowsdll(); "" -}; \
done
- @ : {- output_on() -}
+ @ : {- output_on() if $config{no_shared}; "" -}
@$(PERL) $(SRCDIR)/util/mkdir-p.pl
$(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
@echo "install libcrypto.pc ->
$(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc"
@cp libcrypto.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
@@ -274,7 +274,7 @@ uninstall_dev:
: {- output_off() unless windowsdll(); "" -}; \
echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a"; \
$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a; \
- : {- output_on() -}; \
+ : {- output_on() unless windowsdll(); "" -}; \
done
@echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc"
@$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
@@ -318,7 +318,7 @@ install_runtime:
mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \
$(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
done
- : {- output_on() -};
+ : {- output_on() unless windowsdll(); "" -};
@set -e; for x in $(PROGRAMS); do \
fn=`basename $$x`; \
echo "install $$x -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
@@ -374,7 +374,7 @@ uninstall_runtime:
echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
done
- : {- output_on() -};
+ : {- output_on() unless windowsdll(); "" -};
$(RM) $(DESTDIR)$(OPENSSLDIR)/openssl.cnf
# A method to extract all names from a .pod file
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
