diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/installwin.mk | 11 | ||||
| -rw-r--r-- | make/libtool.mk | 13 |
2 files changed, 12 insertions, 12 deletions
diff --git a/make/installwin.mk b/make/installwin.mk index 4acf9e3f..af17ba81 100644 --- a/make/installwin.mk +++ b/make/installwin.mk @@ -17,11 +17,12 @@ 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 - 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; \ fi + if [ -d doc/html ]; then \ + cp -r doc/html $(DEST)/doc; \ + fi + if [ -d doc/singlehtml ]; then \ + cp -r doc/singlehtml $(DEST)/doc; \ + fi 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 |