diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-04-21 19:35:41 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2019-06-09 14:04:31 +0100 |
| commit | 9c5a924afbd2f05318491fc18621274579fdd337 (patch) | |
| tree | 0f3aa656f767b8ce68c260dc1d65b6094d1afa82 | |
| parent | f3ab0e4527165d0cf235356eeee6263784ee7502 (diff) | |
doc: Only install ancillary files from yelp-build if they exist
Newer versions of yelp-build don't install jquery.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=106171
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
(cherry picked from commit bab857fb6f75ffe0ac3771de4b8272ad97623a2c)
| -rw-r--r-- | doc/Makefile.am | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 8bc85c53..6e01e1ab 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) $(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) $(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 @@ -149,7 +156,11 @@ dbus-docs: $(STATIC_DOCS) $(MAN_XML_FILES) $(dist_doc_DATA) $(dist_html_DATA) $( $(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 |