diff options
author | Tomas Mraz <tomas@openssl.org> | 2021-05-24 19:57:28 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-05-25 11:53:36 +0200 |
commit | 817d408dd9a8d31866351e4676d232dce93ebbcf (patch) | |
tree | 12c3feb779fb98b1366b73398152f3da28ac493f /Configurations | |
parent | 349fd92429145a5821e96dabae1c82eab93caa80 (diff) |
Do not try to install image directories with no images
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15433)
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/unix-Makefile.tmpl | 42 | ||||
-rw-r--r-- | Configurations/windows-makefile.tmpl | 9 |
2 files changed, 0 insertions, 51 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index c428b5f85a..5a5d44ce15 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1078,31 +1078,7 @@ uninstall_html_docs: uninstall_image_docs done install_image_docs: - @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man1/img - @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man3/img - @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man5/img @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man7/img - @set -e; for x in dummy $(IMAGEDOCS1); do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man1/img/$$fn"; \ - cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man1/img/$$fn; \ - chmod 644 $(DESTDIR)$(HTMLDIR)/man1/img/$$fn; \ - done - @set -e; for x in dummy $(IMAGEDOCS3); do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man3/img/$$fn"; \ - cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man3/img/$$fn; \ - chmod 644 $(DESTDIR)$(HTMLDIR)/man3/img/$$fn; \ - done - @set -e; for x in dummy $(IMAGEDOCS5); do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man5/img/$$fn"; \ - cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man5/img/$$fn; \ - chmod 644 $(DESTDIR)$(HTMLDIR)/man5/img/$$fn; \ - done @set -e; for x in dummy $(IMAGEDOCS7); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ @@ -1112,24 +1088,6 @@ install_image_docs: done uninstall_image_docs: - @set -e; for x in dummy $(IMAGEDOCS1); do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man1/img/$$fn"; \ - $(RM) $(DESTDIR)$(HTMLDIR)/man1/img/$$fn; \ - done - @set -e; for x in dummy $(IMAGEDOCS3); do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man3/img/$$fn"; \ - $(RM) $(DESTDIR)$(HTMLDIR)/man3/img/$$fn; \ - done - @set -e; for x in dummy $(IMAGEDOCS5); do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man5/img/$$fn"; \ - $(RM) $(DESTDIR)$(HTMLDIR)/man5/img/$$fn; \ - done @set -e; for x in dummy $(IMAGEDOCS7); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 632e5ce4b5..b36592d383 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -624,16 +624,7 @@ uninstall_html_docs: uninstall_image_docs install_image_docs: @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) @echo *** Installing HTML images - @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man1\img" - @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man3\img" - @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man5\img" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man7\img" - @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man1\img\*.png \ - "$(INSTALLTOP)\html\man1\img" - @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man3\img\*.png \ - "$(INSTALLTOP)\html\man3\img" - @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man5\img\*.png \ - "$(INSTALLTOP)\html\man5\img" @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man7\img\*.png \ "$(INSTALLTOP)\html\man7\img" |