From a372a988fdcdf84c8ba2e47f021802fc3ffb9089 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sat, 11 Dec 2021 17:16:05 -0500 Subject: Switch build from docbook manual to sphinx Also remove linearization from qpdf-manual.pdf. It's a small file, and removing the dependency on the qpdf executable significantly shortens build times. --- make/installwin.mk | 3 ++- make/libtool.mk | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'make') diff --git a/make/installwin.mk b/make/installwin.mk index 3ed541ae..4acf9e3f 100644 --- a/make/installwin.mk +++ b/make/installwin.mk @@ -17,9 +17,10 @@ installwin: all cp qpdf/$(OUTPUT_DIR)/fix-qdf.exe $(DEST)/bin cp include/qpdf/*.h $(DEST)/include/qpdf cp include/qpdf/*.hh $(DEST)/include/qpdf - cp doc/stylesheet.css $(DEST)/doc if [ -f doc/qpdf-manual.html ]; then \ + mkdir $(DEST)/doc/_static; \ cp doc/qpdf-manual.html $(DEST)/doc; \ + cp doc/_static/* $(DEST)/doc/_static; \ fi if [ -f doc/qpdf-manual.pdf ]; then \ cp doc/qpdf-manual.pdf $(DEST)/doc; \ diff --git a/make/libtool.mk b/make/libtool.mk index 2ff96f86..eda53732 100644 --- a/make/libtool.mk +++ b/make/libtool.mk @@ -120,6 +120,12 @@ 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. + install: all install-libs ./mkinstalldirs -m 0755 $(DESTDIR)$(bindir) ./mkinstalldirs -m 0755 $(DESTDIR)$(docdir) @@ -133,9 +139,10 @@ install: all install-libs $(LIBTOOL) --mode=install ./install-sh \ qpdf/$(OUTPUT_DIR)/fix-qdf \ $(DESTDIR)$(bindir)/fix-qdf - ./install-sh -m 0644 doc/stylesheet.css $(DESTDIR)$(docdir) 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); \ -- cgit v1.2.3-70-g09d2