diff options
| author | Sebastian Andrzej Siewior <sebastian@breakpoint.cc> | 2020-04-25 20:29:48 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-04-28 12:09:11 +0200 |
| commit | cf86057a1acd13b13c9bd8f7b8a14bbc0e3ffd56 (patch) | |
| tree | bc7161db02b171d9239f48d1e26a2b5997a78c55 /Configurations | |
| parent | c9c78d271e650a34753941507b9e13806ce38560 (diff) | |
Configurations: Identify the shell variables around MANSUFFIX
With MANSUFFIX=A the statement '$$fn$(MANSUFFIX)' is reaplaces with
'$fnA' and left empty because the `fnA' variables is not recognized
within the shell.
With {} around fn it is then bocomes ${fn}A and works as expected.
While here, add the MANSUFFIX to the ECHO line so it is properly printed
during build.
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11643)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 1ab5f4bb0c..41a35aae65 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -859,30 +859,30 @@ install_man_docs: build_man_docs @set -e; for x in dummy $(MANDOCS1); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man1/$$fn"; \ - cp $$x $(DESTDIR)$(MANDIR)/man1/$$fn$(MANSUFFIX); \ - chmod 755 $(DESTDIR)$(MANDIR)/man1/$$fn$(MANSUFFIX); \ + $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \ + cp $$x $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX); \ + chmod 755 $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX); \ done @set -e; for x in dummy $(MANDOCS3); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man3/$$fn"; \ - cp $$x $(DESTDIR)$(MANDIR)/man3/$$fn$(MANSUFFIX); \ - chmod 755 $(DESTDIR)$(MANDIR)/man3/$$fn$(MANSUFFIX); \ + $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \ + cp $$x $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX); \ + chmod 755 $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX); \ done @set -e; for x in dummy $(MANDOCS5); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man5/$$fn"; \ - cp $$x $(DESTDIR)$(MANDIR)/man5/$$fn$(MANSUFFIX); \ - chmod 755 $(DESTDIR)$(MANDIR)/man5/$$fn$(MANSUFFIX); \ + $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \ + cp $$x $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX); \ + chmod 755 $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX); \ done @set -e; for x in dummy $(MANDOCS7); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man7/$$fn"; \ - cp $$x $(DESTDIR)$(MANDIR)/man7/$$fn$(MANSUFFIX); \ - chmod 755 $(DESTDIR)$(MANDIR)/man7/$$fn$(MANSUFFIX); \ + $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \ + cp $$x $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX); \ + chmod 755 $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX); \ done uninstall_man_docs: @@ -890,26 +890,26 @@ uninstall_man_docs: @set -e; for x in dummy $(MANDOCS1); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ - $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man1/$$fn"; \ - $(RM) $(DESTDIR)$(MANDIR)/man1/$$fn$(MANSUFFIX); \ + $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \ + $(RM) $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX); \ done @set -e; for x in dummy $(MANDOCS3); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ - $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man3/$$fn"; \ - $(RM) $(DESTDIR)$(MANDIR)/man3/$$fn$(MANSUFFIX); \ + $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \ + $(RM) $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX); \ done @set -e; for x in dummy $(MANDOCS5); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ - $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man5/$$fn"; \ - $(RM) $(DESTDIR)$(MANDIR)/man5/$$fn$(MANSUFFIX); \ + $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \ + $(RM) $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX); \ done @set -e; for x in dummy $(MANDOCS7); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ - $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man7/$$fn"; \ - $(RM) $(DESTDIR)$(MANDIR)/man7/$$fn$(MANSUFFIX); \ + $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \ + $(RM) $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX); \ done install_html_docs: build_html_docs |