diff options
author | Bruno Haible <bruno@clisp.org> | 2019-02-14 03:09:47 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2019-02-14 03:09:47 +0100 |
commit | 2c0ed45908fb2cdedfe92b8a1bef2f69034a4fb7 (patch) | |
tree | f62338bc5351b867c543345bc6d208e0e52bc1d4 | |
parent | 851085879fb16ca7ad1156e86bc1064c295a5208 (diff) | |
download | libunistring-2c0ed45908fb2cdedfe92b8a1bef2f69034a4fb7.tar.gz |
doc: Assume that the texinfo sources are in the source dir.
* doc/Makefile.am (stamp-vti, libunistring.html, libunistring_toc.html):
Lookup libunistring.texi in $(srcdir).
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | doc/Makefile.am | 9 |
2 files changed, 10 insertions, 5 deletions
@@ -1,5 +1,11 @@ 2019-02-13 Bruno Haible <bruno@clisp.org> + doc: Assume that the texinfo sources are in the source dir. + * doc/Makefile.am (stamp-vti, libunistring.html, libunistring_toc.html): + Lookup libunistring.texi in $(srcdir). + +2019-02-13 Bruno Haible <bruno@clisp.org> + doc: Fix hyperlinks to table of contents in HTML doc. Reported by Akim Demaille <akim.demaille@gmail.com>. * doc/Makefile.am (libunistring_toc.html): Replace references to diff --git a/doc/Makefile.am b/doc/Makefile.am index 44027dd..2da7675 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -41,8 +41,7 @@ libunistring_TEXINFOS = \ # So we have to duplicate the entire rule which would otherwise be generated # by automake. $(srcdir)/stamp-vti: $(info_TEXINFOS) $(libunistring_TEXINFOS) $(top_srcdir)/version.sh - (dir=.; test -f ./libunistring.texi || dir=$(srcdir); \ - set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/libunistring.texi`; \ + (set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $(srcdir)/libunistring.texi`; \ echo "@set UPDATED $$1 $$2 $$3"; \ echo "@set UPDATED-MONTH $$2 $$3"; \ echo "@set EDITION $(VERSION)"; \ @@ -136,14 +135,14 @@ html-split: libunistring_toc.html # Override of automake's definition. # We want to use texi2html, not makeinfo --html. libunistring.html: libunistring.texi version.texi $(libunistring_TEXINFOS) - $(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -monolithic `if test -f libunistring.texi; then echo libunistring.texi; else echo $(srcdir)/libunistring.texi; fi` + $(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -monolithic $(srcdir)/libunistring.texi libunistring_toc.html: libunistring.texi version.texi $(libunistring_TEXINFOS) case "@PERL@" in \ *"/missing perl") \ - $(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -split_chapter `if test -f libunistring.texi; then echo libunistring.texi; else echo $(srcdir)/libunistring.texi; fi` || exit 0 ;; \ + $(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -split_chapter $(srcdir)/libunistring.texi || exit 0 ;; \ *) $(RM) libunistring_*.html ; \ - $(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -split_chapter `if test -f libunistring.texi; then echo libunistring.texi; else echo $(srcdir)/libunistring.texi; fi` ;; \ + $(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -split_chapter $(srcdir)/libunistring.texi ;; \ esac \ && { mv libunistring/libunistring.html libunistring_toc.html; \ for file in libunistring/*.html; do \ |