diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2014-08-11 18:34:54 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2014-08-11 20:56:09 +0200 |
| commit | 6df59971464d3d2452b3bd4109a3cdec2457f30a (patch) | |
| tree | b0afd1cd9313acf883faa334ab4c1b89fef0f875 | |
| parent | 51b9ee37b25a0e8ddc0ec3823f694f4ccacc8cd0 (diff) | |
| download | zsh-6df59971464d3d2452b3bd4109a3cdec2457f30a.tar.gz zsh-6df59971464d3d2452b3bd4109a3cdec2457f30a.zip | |
Add patch to fix source vs build directory mixup
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/texi2html-conf-source-dir-vs-build-dir | 35 |
2 files changed, 36 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 8d7c83249..350a48b39 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ replace-texi2html-with-makeinfo +texi2html-conf-source-dir-vs-build-dir diff --git a/debian/patches/texi2html-conf-source-dir-vs-build-dir b/debian/patches/texi2html-conf-source-dir-vs-build-dir new file mode 100644 index 000000000..5f6486295 --- /dev/null +++ b/debian/patches/texi2html-conf-source-dir-vs-build-dir @@ -0,0 +1,35 @@ +Description: Fixes source vs build directory mixup +Forwarded: http://www.zsh.org/mla/workers/2014/msg00763.html +Author: Axel Beckert <abe@debian.org> + +Index: zsh/Doc/Makefile.in +=================================================================== +--- zsh.orig/Doc/Makefile.in 2014-08-11 20:33:31.000000000 +0200 ++++ zsh/Doc/Makefile.in 2014-08-11 20:40:02.000000000 +0200 +@@ -42,7 +42,7 @@ + TEXI2DVI = texi2dvi + DVIPS = dvips + TEXI2HTML = makeinfo --html --output . --ifinfo --split=chapter --node-files \ +- --init-file $(sdir)/texi2html.conf ++ --init-file texi2html.conf + + .SUFFIXES: .yo .1 + +@@ -160,7 +160,7 @@ + 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 @@ + + 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) + ( \ |