From 426b4ce8565e4f9143c122fd3afbcc22598fc6c4 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sat, 18 Dec 2021 11:19:20 -0500 Subject: Update documentation build/installation --- make/libtool.mk | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'make/libtool.mk') diff --git a/make/libtool.mk b/make/libtool.mk index eda53732..e023bc60 100644 --- a/make/libtool.mk +++ b/make/libtool.mk @@ -121,8 +121,6 @@ install-libs: build_libqpdf # NOTE: If installing any new executables, remember to update the # lambda layer code in build-scripts/build-appimage. -# NOTE: See comments in manual/build.mk about html documentation. - # Ensure that installwin in make/installwin.mk is consistent with # this. @@ -139,12 +137,13 @@ install: all install-libs $(LIBTOOL) --mode=install ./install-sh \ qpdf/$(OUTPUT_DIR)/fix-qdf \ $(DESTDIR)$(bindir)/fix-qdf - if [ -f doc/qpdf-manual.html ]; then \ - ./mkinstalldirs -m 0755 $(DESTDIR)$(docdir)/_static; \ - ./install-sh -m 0644 doc/qpdf-manual.html $(DESTDIR)$(docdir); \ - ./install-sh -m 0644 doc/_static/* $(DESTDIR)$(docdir)/_static; \ - fi if [ -f doc/qpdf-manual.pdf ]; then \ ./install-sh -m 0644 doc/qpdf-manual.pdf $(DESTDIR)$(docdir); \ fi + if [ -d doc/html ]; then \ + cp -r doc/html $(DESTDIR)/$(docdir); \ + fi + if [ -d doc/singlehtml ]; then \ + cp -r doc/singlehtml $(DESTDIR)/$(docdir); \ + fi ./install-sh -m 0644 doc/*.1 $(DESTDIR)$(mandir)/man1 -- cgit v1.2.3-54-g00ecf