[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  4a498d0ed50f377584ebadce715fbcc2c0f53c23 (commit)
      from  401e1c9d9d2202fff557f6286f47214803bf7e15 (commit)


- Log -----------------------------------------------------------------
commit 4a498d0ed50f377584ebadce715fbcc2c0f53c23
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Nov 9 12:08:08 2018 +0100

    Fix cherry-pick error
    
    A couple of $(ECHO) sneaked in from patches in newer branches
    
    Fixes #7600
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7601)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 181b618..7254478 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -517,7 +517,7 @@ install_runtime_libs: build_libs
 install_programs: install_runtime_libs build_programs
 	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
 	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin
-	@$(ECHO) "*** Installing runtime programs"
+	@echo "*** Installing runtime programs"
 	@set -e; for x in dummy $(INSTALL_PROGRAMS); do \
 		if [ "$$x" = "dummy" ]; then continue; fi; \
 		fn=`basename $$x`; \
@@ -558,7 +558,7 @@ uninstall_programs:
 	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin
 
 uninstall_runtime_libs:
-	@$(ECHO) "*** Uninstalling runtime libraries"
+	@echo "*** Uninstalling runtime libraries"
 	@ : {- output_off() unless windowsdll(); "" -}
 	@set -e; for s in dummy $(INSTALL_SHLIBS); do \
 		if [ "$$s" = "dummy" ]; then continue; fi; \