Commit 6b6bebaf authored by Ben Gamari's avatar Ben Gamari 🐢

Fix installation of static sphinx assets

Previously the `_static` and `_sources` directories were installed in
the wrong parents. See #11803
parent 06b7ce21
......@@ -950,14 +950,8 @@ ifneq "$(INSTALL_LIBRARY_DOCS)" ""
$(INSTALL_SCRIPT) $(INSTALL_OPTS) libraries/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/"
endif
ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
# We need to filter out the directories so install doesn't choke on them
for i in $(INSTALL_HTML_DOC_DIRS); do \
$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
for f in $$i/*; do \
if test -f $$f; then \
$(INSTALL_DOC) $(INSTALL_OPTS) "$$f" "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
fi \
done \
$(CP) -Rp $$i "$(DESTDIR)$(docdir)/html"; \
done
endif
......
......@@ -31,7 +31,7 @@ $(call all-target,$1,)
ifeq "$$(phase)" "final"
ifeq "$$(BUILD_SPHINX_HTML)" "YES"
$(call all-target,$1,html_$1)
INSTALL_HTML_DOC_DIRS += $1/build-html/$2 $1/build-html/$2/_static $1/build-html/$2/_sources
INSTALL_HTML_DOC_DIRS += $1/build-html/$2
endif
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment