Introduce two new patches that revert the conflicting part of the

[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 d7fb1b6038e81875f473647649c42d55c5c6e951..5cbd7624f8c54c9037b4a6aa17aab5bbe06f6e82 100644 (file)
--- a/debian/patches/debian-specific/build_doc_adjustments.diff
+++ b/debian/patches/debian-specific/build_doc_adjustments.diff
@@ -1,16 +1,19 @@
-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:
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -100,8 +100,9 @@ uninstall-local:

  
  check:
  
  check:

- manual.txt: manual.html
--      -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.txt: manual.html db-cleanup.xsl
+-      -xsltproc --nonet -o manual-txt.html $(srcdir)/db-cleanup.xsl manual.html || cp manual.html manual-txt.html
+-      -lynx -dump -nolist -with_backspaces manual-txt.html > $@ || \
++      xsltproc --nonet -o manual-txt.html $(srcdir)/db-cleanup.xsl manual.html || cp manual.html manual-txt.html
++      links.main -dump $< > $@ || links -dump $< > $@ || \
++      lynx -dump -nolist -with_backspaces manual-txt.html > $@ || \
+       w3m -dump manual-txt.html > $@ || \
+       elinks -dump -no-numbering -no-references manual-txt.html > $@
+ 
+@@ -115,10 +116,10 @@ stamp-doc-rc: $(top_srcdir)/init.h maked
+       touch stamp-doc-rc

  
  manual.html: $(srcdir)/html.xsl stamp-doc-xml
 -      -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
  
  manual.html: $(srcdir)/html.xsl stamp-doc-xml
 -      -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml