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)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index c428b5f85a7e961e2cd996324a9cfd9107cb0d4b..5a5d44ce15695772d0b587192b59f14a78ee9c73 100644 (file)
--- 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 632e5ce4b552ff224f12322002c53650a30b02f4..b36592d3834f10e12edc2fbd39c393beaab91e29 100644 (file)
--- 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"