In templates, output_on() must be used the same way as output_off()

Otherwise, there will be an unbalance.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index ef745edc1ed7fd8d4cafec8433c0b6d1a170314a..1c5f58af2513202726685835a217ab2e5bffa7d6 100644 (file)
--- 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}}) -}
                 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"
 
 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]
         @ 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
 
 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 c649d3d3c8d35d5cde087f82b2059fdac3c42ac3..d416c21495a883bdae5bd3bcdea638c73e6ad8b7 100644 (file)
--- 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; \
                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
        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
        @$(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_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
        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
                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"; \
        @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
                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
        $(RM) $(DESTDIR)$(OPENSSLDIR)/openssl.cnf
 
 # A method to extract all names from a .pod file