diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/installwin.mk | 11 | ||||
| -rw-r--r-- | make/libtool.mk | 12 |
2 files changed, 4 insertions, 19 deletions
diff --git a/make/installwin.mk b/make/installwin.mk index af17ba81..e6ba534f 100644 --- a/make/installwin.mk +++ b/make/installwin.mk @@ -8,7 +8,6 @@ installwin: all mkdir $(DEST)/lib mkdir $(DEST)/include mkdir $(DEST)/include/qpdf - mkdir $(DEST)/doc cp libqpdf/$(OUTPUT_DIR)/$(IMPORT_LIB_NAME) $(DEST)/lib cp libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(DEST)/bin perl copy_dlls libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(DEST)/bin $(OBJDUMP) $(WINDOWS_WORDSIZE) @@ -17,12 +16,6 @@ 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.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; \ + if [ -d doc ]; then \ + cp -r doc $(DEST); \ fi diff --git a/make/libtool.mk b/make/libtool.mk index e023bc60..6078d650 100644 --- a/make/libtool.mk +++ b/make/libtool.mk @@ -137,13 +137,5 @@ install: all install-libs $(LIBTOOL) --mode=install ./install-sh \ qpdf/$(OUTPUT_DIR)/fix-qdf \ $(DESTDIR)$(bindir)/fix-qdf - 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 + ./install-sh -m 0644 README-doc.txt $(DESTDIR)$(docdir); \ + ./install-sh -m 0644 manual/$(OUTPUT_DIR)/*.1 $(DESTDIR)$(mandir)/man1 |