summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Makefile.in6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index dacbd3b81..7b955aa47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-12 Peter Stephenson <p.stephenson@samsung.com>
+
+ * Axel Beckert: 32975, 32984: Doc/Zsh/Makefile.in: texi2html.conf
+ location was inconsistent when building out of tree.
+
2014-08-10 Peter Stephenson <p.w.stephenson@ntlworld.com>
* unposted: Completion/Base/Completer/.distfiles,
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index c86f34947..f4ee0d760 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -42,7 +42,7 @@ MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
DVIPS = dvips
TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files \
- --init-file $(sdir)/texi2html.conf
+ --init-file texi2html.conf
.SUFFIXES: .yo .1
@@ -160,7 +160,7 @@ zsh_a4.ps: zsh.dvi
html: zsh_toc.html
.PHONY: html
-zsh_toc.html: $(sdir)/zsh.texi $(sdir)/texi2html.conf
+zsh_toc.html: $(sdir)/zsh.texi texi2html.conf
$(TEXI2HTML) $(sdir)/zsh.texi
zshall.1: zsh.yo
@@ -251,7 +251,7 @@ version.yo: $(sdir_top)/Config/version.mk
texi2html.conf: $(sdir_top)/Config/version.mk
echo '$$PRE_BODY_CLOSE = "<font size=\"-1\">Zsh version $(VERSION), released on $(VERSION_DATE).</font>";' \
- > $(sdir)/$@
+ > $@
Zsh/modlist.yo: $(MODDOCSRC)
( \