diff options
| author | Bob Beck <[email protected]> | 2026-08-08 14:18:31 +0200 |
|---|---|---|
| committer | Tomas Mraz <[email protected]> | 2026-09-01 16:02:42 +0200 |
| commit | c6c9d43917907250daab6f29a143b1d466747f08 (patch) | |
| tree | 4dfce56bbead2ef2596d249dc5caafb23dc7b27c /Configurations | |
| parent | Strip the line ending from continuation lines in the mkerr state (diff) | |
| download | openssl-c6c9d43917907250daab6f29a143b1d466747f08.tar.gz openssl-c6c9d43917907250daab6f29a143b1d466747f08.zip | |
Install the HTML manual pages through install-files.pl
The per-page copy loops become one process per section that
replaces only a page whose content changed, matching the man page
and header installs; an unchanged page keeps its timestamp and a
reinstall is quiet. The image documents get the same treatment.
Reviewed-by: Neil Horman <[email protected]>
Reviewed-by: Andrew Dinh <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
Merge-date: Tue Sep 1 14:03:09 2026
Merged-from: https://github.com/openssl/openssl/pull/32243
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 49 |
1 files changed, 14 insertions, 35 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 250e08848b0..102ead2513a 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -241,18 +241,22 @@ MISC_SCRIPTS={- IMAGEDOCS1={- join(" \\\n" . ' ' x 10, fill_lines(" ", $COLUMNS - 10, + map { '$(SRCDIR)/'.$_ } @{$unified_info{imagedocs}->{man1}})) -} IMAGEDOCS3={- join(" \\\n" . ' ' x 10, fill_lines(" ", $COLUMNS - 10, + map { '$(SRCDIR)/'.$_ } @{$unified_info{imagedocs}->{man3}})) -} IMAGEDOCS5={- join(" \\\n" . ' ' x 10, fill_lines(" ", $COLUMNS - 10, + map { '$(SRCDIR)/'.$_ } @{$unified_info{imagedocs}->{man5}})) -} IMAGEDOCS7={- join(" \\\n" . ' ' x 10, fill_lines(" ", $COLUMNS - 10, + map { '$(SRCDIR)/'.$_ } @{$unified_info{imagedocs}->{man7}})) -} HTMLDOCS1={- join(" \\\n" . ' ' x 10, @@ -1111,34 +1115,14 @@ install_html_docs: install_image_docs build_html_docs @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man5" @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man7" @$(ECHO) "*** Installing HTML manpages" - @set -e; for x in dummy $(HTMLDOCS1); do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man1/$$fn"; \ - cp $$x "$(DESTDIR)$(HTMLDIR)/man1/$$fn"; \ - chmod 644 "$(DESTDIR)$(HTMLDIR)/man1/$$fn"; \ - done - @set -e; for x in dummy $(HTMLDOCS3); do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man3/$$fn"; \ - cp $$x "$(DESTDIR)$(HTMLDIR)/man3/$$fn"; \ - chmod 644 "$(DESTDIR)$(HTMLDIR)/man3/$$fn"; \ - done - @set -e; for x in dummy $(HTMLDOCS5); do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man5/$$fn"; \ - cp $$x "$(DESTDIR)$(HTMLDIR)/man5/$$fn"; \ - chmod 644 "$(DESTDIR)$(HTMLDIR)/man5/$$fn"; \ - done - @set -e; for x in dummy $(HTMLDOCS7); do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man7/$$fn"; \ - cp $$x "$(DESTDIR)$(HTMLDIR)/man7/$$fn"; \ - chmod 644 "$(DESTDIR)$(HTMLDIR)/man7/$$fn"; \ - done + @$(PERL) $(SRCDIR)/util/install-files.pl 644 \ + "$(DESTDIR)$(HTMLDIR)/man1" $(HTMLDOCS1) + @$(PERL) $(SRCDIR)/util/install-files.pl 644 \ + "$(DESTDIR)$(HTMLDIR)/man3" $(HTMLDOCS3) + @$(PERL) $(SRCDIR)/util/install-files.pl 644 \ + "$(DESTDIR)$(HTMLDIR)/man5" $(HTMLDOCS5) + @$(PERL) $(SRCDIR)/util/install-files.pl 644 \ + "$(DESTDIR)$(HTMLDIR)/man7" $(HTMLDOCS7) uninstall_html_docs: uninstall_image_docs @$(ECHO) "*** Uninstalling HTML manpages" @@ -1169,13 +1153,8 @@ uninstall_html_docs: uninstall_image_docs install_image_docs: @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man7/img" - @set -e; for x in dummy $(IMAGEDOCS7); do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \ - cp $(SRCDIR)/$$x "$(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \ - chmod 644 "$(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \ - done + @$(PERL) $(SRCDIR)/util/install-files.pl 644 \ + "$(DESTDIR)$(HTMLDIR)/man7/img" $(IMAGEDOCS7) uninstall_image_docs: @set -e; for x in dummy $(IMAGEDOCS7); do \ |