From aec30c20a1b6a8792ed274cb476b048adcc947ab Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Sat, 21 Apr 2018 19:35:41 +0100
Subject: [PATCH 1/2] doc: Only install ancillary files from yelp-build if they
 exist

Newer versions of yelp-build don't install jquery.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 doc/Makefile.am | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 629d74d9..31e6e3e6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -104,7 +104,7 @@ dbus.devhelp: $(srcdir)/doxygen_to_devhelp.xsl doxygen.stamp
 endif
 
 if DBUS_DUCKTYPE_DOCS_ENABLED
-html_DATA += $(YELP_HTML) $(YELP_STATIC_HTML)
+html_DATA += $(YELP_HTML)
 
 %.page: %.duck
 	$(DUCKTYPE) -o $@ $<
@@ -118,6 +118,13 @@ endif
 install-data-local:: doxygen.stamp
 	$(MKDIR_P) $(DESTDIR)$(apidir)
 	$(INSTALL_DATA) api/html/* $(DESTDIR)$(apidir)
+if DBUS_DUCKTYPE_DOCS_ENABLED
+	$(AM_V_at)for x in $(YELP_STATIC_HTML); do \
+		if test -e "$$x"; then \
+			$(INSTALL_DATA) "$$x" $(DESTDIR)$(htmldir); \
+		fi; \
+	done
+endif
 
 uninstall-local::
 	rm -f $(DESTDIR)$(apidir)/*.html
@@ -141,7 +148,7 @@ BONUS_FILES = \
 	$(top_srcdir)/COPYING \
 	$(top_srcdir)/ChangeLog
 
-dbus-docs: $(STATIC_DOCS) $(dist_dtd_DATA) $(MAN_XML_FILES) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp $(XMLTO_HTML) $(YELP_HTML) $(YELP_STATIC_HTML)
+dbus-docs: $(STATIC_DOCS) $(dist_dtd_DATA) $(MAN_XML_FILES) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp $(XMLTO_HTML) $(YELP_HTML)
 	$(AM_V_at)rm -rf $@ $@.tmp
 	$(AM_V_GEN)$(MKDIR_P) $@.tmp/api
 	$(AM_V_at)cd $(srcdir) && cp $(STATIC_DOCS) @abs_builddir@/$@.tmp
@@ -150,7 +157,11 @@ dbus-docs: $(STATIC_DOCS) $(dist_dtd_DATA) $(MAN_XML_FILES) $(dist_doc_DATA) $(d
 	$(AM_V_at)cd $(srcdir) && cp $(STATIC_HTML) @abs_builddir@/$@.tmp
 	$(AM_V_at)cp $(XMLTO_HTML) @abs_builddir@/$@.tmp
 	$(AM_V_at)cp $(YELP_HTML) @abs_builddir@/$@.tmp
-	$(AM_V_at)cp $(YELP_STATIC_HTML) @abs_builddir@/$@.tmp
+	$(AM_V_at)for x in $(YELP_STATIC_HTML); do \
+		if test -e "$$x"; then \
+			cp "$$x" @abs_builddir@/$@.tmp; \
+		fi; \
+	done
 	$(AM_V_at)cp $(MAN_HTML_FILES) @abs_builddir@/$@.tmp
 	$(AM_V_at)cp $(MAN_XML_FILES) @abs_builddir@/$@.tmp
 	$(AM_V_at)cp $(BONUS_FILES) @abs_builddir@/$@.tmp
-- 
2.17.0