diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-03-02 17:50:36 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-02 17:50:36 +0900 |
commit | 245b464fac15a0fa2a2ce5ba9e23f032c311b68a (patch) | |
tree | 14e825f687e27c67b2b24ac79fd4c8697451f180 | |
parent | 70ece3977ae20505763cc1e0f88287f7aec56639 (diff) | |
parent | 3987734c18e46728131ecc6e88a0631999551931 (diff) | |
download | sphinx-git-245b464fac15a0fa2a2ce5ba9e23f032c311b68a.tar.gz |
Merge pull request #6122 from tk0miya/refactor_texinfo
Fix texinfo: ``make install-info`` fails
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | sphinx/templates/texinfo/Makefile | 13 |
2 files changed, 9 insertions, 6 deletions
@@ -20,6 +20,8 @@ Bugs fixed * #3620: html: Defer searchindex.js rather than loading it via ajax * #6113: html: Table cells and list items have large margins * #5508: ``linenothreshold`` option for ``highlight`` directive was ignored +* texinfo: ``make install-info`` causes syntax error +* texinfo: ``make install-info`` fails on macOS Testing -------- diff --git a/sphinx/templates/texinfo/Makefile b/sphinx/templates/texinfo/Makefile index 276a66136..8befee3ca 100644 --- a/sphinx/templates/texinfo/Makefile +++ b/sphinx/templates/texinfo/Makefile @@ -17,15 +17,16 @@ html: $(addsuffix .html,$(ALLDOCS)) pdf: $(addsuffix .pdf,$(ALLDOCS)) install-info: info - for f in *.info; do \\ - cp -t $(infodir) "$$f" && \\ - $(INSTALL_INFO) --info-dir=$(infodir) "$$f" ; \\ + for f in *.info; do \ + mkdir -p $(infodir) && \ + cp "$$f" $(infodir) && \ + $(INSTALL_INFO) --info-dir=$(infodir) "$$f" ; \ done uninstall-info: info - for f in *.info; do \\ - rm -f "$(infodir)/$$f" ; \\ - $(INSTALL_INFO) --delete --info-dir=$(infodir) "$$f" ; \\ + for f in *.info; do \ + rm -f "$(infodir)/$$f" ; \ + $(INSTALL_INFO) --delete --info-dir=$(infodir) "$$f" ; \ done %.info: %.texi |