From 36916619f0b07b4412df5a96683579552dd96285 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Tue, 21 Dec 2021 09:23:20 -0500
Subject: Stop adding pre-built documentation to the source distribution

---
 manual/build.mk | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

(limited to 'manual/build.mk')

diff --git a/manual/build.mk b/manual/build.mk
index b07bf830..bca1253d 100644
--- a/manual/build.mk
+++ b/manual/build.mk
@@ -6,7 +6,10 @@ HTML_TARGET := $(HTML_OUT)/index.html
 PDF_OUT := $(DOC_OUT)/latex
 PDF_TARGET := $(PDF_OUT)/qpdf.pdf
 
-TARGETS_manual := doc/qpdf.1 doc/fix-qdf.1 doc/zlib-flate.1
+TARGETS_manual := \
+    $(DOC_OUT)/qpdf.1 \
+    $(DOC_OUT)/fix-qdf.1 \
+    $(DOC_OUT)/zlib-flate.1
 ifeq ($(BUILD_HTML),1)
 TARGETS_manual += $(HTML_TARGET) $(S_HTML_TARGET)
 endif
@@ -22,23 +25,31 @@ MANUAL_DEPS = $(wildcard manual/*.rst) manual/conf.py
 # the error "_pickle.UnpicklingError: pickle data was truncated"
 $(HTML_TARGET): $(MANUAL_DEPS)
 	$(SPHINX) -M html manual $(DOC_OUT) -W
-	mkdir -p doc
-	rm -rf doc/html
-	cp -r $(DOC_OUT)/html doc
 
 $(S_HTML_TARGET): $(MANUAL_DEPS) | $(HTML_TARGET)
 	$(SPHINX) -M singlehtml manual $(DOC_OUT) -W
-	mkdir -p doc
-	rm -rf doc/singlehtml
-	cp -r $(DOC_OUT)/singlehtml doc
 
 $(PDF_TARGET): $(MANUAL_DEPS) | $(S_HTML_TARGET) $(HTML_TARGET)
 	$(SPHINX) -M latexpdf manual $(DOC_OUT) -W
-	mkdir -p doc
-	cp $(PDF_TARGET) doc/qpdf-manual.pdf
 
-doc/%.1: manual/%.1.in
-	mkdir -p doc
-	sed -e 's:@PACKAGE_VERSION@:$(PACKAGE_VERSION):g' \
-	    -e 's:@docdir@:$(docdir):g' \
-	    < $< > $@
+$(DOC_OUT)/%.1: manual/%.1.in
+	sed -e 's:@PACKAGE_VERSION@:$(PACKAGE_VERSION):g' < $< > $@
+
+# The doc-dist target must not removed $(DOC_DEST) so that it works to
+# do stuff like make doc-dist DOC_DEST=$(DESTDIR)/$(docdir). Make sure
+# what this does is consistent with ../README-doc.txt and the
+# information in the manual and ../README.md.
+.PHONY: doc-dist
+doc-dist: build_manual
+	@if test x"$(DOC_DEST)" = x; then \
+	    echo DOC_DEST must be set 1>& 2; \
+	    false; \
+	fi
+	if test -d $(DOC_DEST); then \
+	    $(RM) -rf $(DOC_DEST)/*html $(DOC_DEST)/*.pdf; \
+	else \
+	    mkdir -p $(DOC_DEST); \
+	fi
+	cp -r $(DOC_OUT)/html doc
+	cp -r $(DOC_OUT)/singlehtml doc
+	cp $(PDF_TARGET) $(DOC_DEST)/qpdf-manual.pdf
-- 
cgit v1.2.3-70-g09d2