Merge from sarge branch.

[software/mutt-debian.git] / debian / patches / debian-specific / build_doc_adjustments.diff

diff --git a/debian/patches/debian-specific/build_doc_adjustments.diff b/debian/patches/debian-specific/build_doc_adjustments.diff
index f16f8e521d959bcfafeca58cb83aebde916b3a35..d7fb1b6038e81875f473647649c42d55c5c6e951 100644 (file)
--- a/debian/patches/debian-specific/build_doc_adjustments.diff
+++ b/debian/patches/debian-specific/build_doc_adjustments.diff
@@ -1,11 +1,16 @@
---- mutt-1.5.11.orig/doc/Makefile.in
-+++ mutt-1.5.11/doc/Makefile.in
-@@ -111,13 +111,13 @@
+Index: doc/Makefile.in
+===================================================================
+--- doc/Makefile.in.orig       2007-05-17 14:47:01.000000000 +0200
++++ doc/Makefile.in    2007-05-17 14:58:34.000000000 +0200
+@@ -435,15 +435,16 @@ uninstall-local:
  
  check:
  manual.txt: manual.html
--      -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
-+      /usr/bin/links.main -dump $^ > $@ || links -dump $^ > $@
+-      -lynx -dump -nolist -with_backspaces $^ > $@ || \
++      /usr/bin/links.main -dump $^ > $@ || links -dump $^ > $@ || \
++      lynx -dump -nolist -with_backspaces $^ > $@ || \
+       w3m -dump $^ > $@ || \
+       elinks -dump -no-numbering -no-references $^ > $@
  
  manual.html: $(srcdir)/html.xsl stamp-doc-xml
 -      -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
@@ -16,4 +21,4 @@
 +      xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
        touch stamp-doc-chunked
  
- manual.pdf: manual.tex
+ $(HTML_DOCFILES): stamp-doc-chunked