diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-03 17:45:14 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-03 17:52:26 +0100 |
| commit | b894054e3f7de6c64b505006395aa24b30928e97 (patch) | |
| tree | 5890f1573093fa15aaef1b651079a4ac85efaa27 | |
| parent | Add KDF support to pkeyutl. Update documentation. (diff) | |
| download | openssl-b894054e3f7de6c64b505006395aa24b30928e97.tar.xz openssl-b894054e3f7de6c64b505006395aa24b30928e97.zip | |
Remove overzealous echoing
This construct in a Makefile is a bit overzealous:
@echo FOO
@FOO
Cleaned up.
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 8ccadbb215..a9f0ae1e5a 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -389,17 +389,12 @@ uninstall_dev: $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \ : {- output_on() unless windowsdll(); "" -}; \ done - @ : {- output_on() if $disabled{shared}; "" -} - @echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc" - @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc - @echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc" - @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc - @echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc" - @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc - @echo $(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig - -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig - @echo $(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) - -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) + @ : {- output_on() if $config{no_shared}; "" -} + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) install_engines: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @@ -427,8 +422,7 @@ uninstall_engines: echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \ done - @echo "$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines" - -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines install_runtime: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @@ -502,10 +496,8 @@ uninstall_runtime: done : {- output_on() unless windowsdll(); "" -}; $(RM) $(DESTDIR)$(OPENSSLDIR)/openssl.cnf - @echo "$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin" - -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin - @echo "$(RMDIR) $(DESTDIR)$(OPENSSLDIR)/misc" - -@$(RMDIR) $(DESTDIR)$(OPENSSLDIR)/misc + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin + -$(RMDIR) $(DESTDIR)$(OPENSSLDIR)/misc # A method to extract all names from a .pod file # The first sed extracts everything between "=head1 NAME" and the next =head1 |