]> granicus.if.org Git - openssl/commitdiff
Fix cherry-pick error
authorRichard Levitte <levitte@openssl.org>
Fri, 9 Nov 2018 11:08:08 +0000 (12:08 +0100)
committerRichard Levitte <levitte@openssl.org>
Fri, 9 Nov 2018 13:13:45 +0000 (14:13 +0100)
A couple of $(ECHO) sneaked in from patches in newer branches

Fixes #7600

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7601)

Configurations/unix-Makefile.tmpl

index 181b618fb51c02a8d6a7867b6f53985ea113fe61..7254478af5476753de257800e0ffab0bad160379 100644 (file)
@@ -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; \