Merge branch '1.5.20-1+fix533459'

[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..71424b07f7845f50977d5808bab7aa77fcf563db 100644 (file)
--- a/debian/patches/debian-specific/build_doc_adjustments.diff
+++ b/debian/patches/debian-specific/build_doc_adjustments.diff
@@ -1,19 +1,27 @@
---- mutt-1.5.11.orig/doc/Makefile.in
-+++ mutt-1.5.11/doc/Makefile.in
-@@ -111,13 +111,13 @@
+Use links(1) to generate the HTML manual page
+
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -100,7 +100,8 @@
  
  check:
  manual.txt: manual.html
--      -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
-+      /usr/bin/links.main -dump $^ > $@ || links -dump $^ > $@
+-      -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \
++      links.main -dump $< > $@ || links -dump $< > $@ || \
++      LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \
+       LC_ALL=C w3m -dump manual.html > $@ || \
+       LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
  
- manual.html: $(srcdir)/html.xsl stamp-doc-xml
+@@ -114,10 +115,10 @@
+       touch stamp-doc-rc
+ 
+ manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
 -      -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
 +      xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
  
- stamp-doc-chunked: $(srcdir)/chunk.xsl stamp-doc-xml
+ stamp-doc-chunked: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
 -      -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
 +      xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
        touch stamp-doc-chunked
  
- manual.pdf: manual.tex
+ $(CHUNKED_DOCFILES): stamp-doc-chunked