← Back to branch summary

~ubuntu-branches/ubuntu/precise/mutt/precise

« back to all changes in this revision

Viewing changes to debian/patches/debian-specific/build_doc_adjustments.diff

  • Committer: Bazaar Package Importer
  • Author(s): أحمد المحمودي (Ahmed El-Mahmoudy)
  • Date: 2009-06-27 23:52:24 UTC
  • mfrom: (2.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090627235224-z52j0hm6cpknxrk1
Tags: 1.5.20-2ubuntu1
https://launchpad.net/bugs/392997
Merge from debian unstable (LP: #392997), remaining changes:
debian/control: Recommend default-mta instead of exim4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/debian-specific/build_doc_adjustments.diff
1
 
Use links(1) to generate the HTML manual page
 
1
Use elinks(1) to generate the HTML manual page
2
2
 
3
3
--- a/doc/Makefile.am
4
4
+++ b/doc/Makefile.am
5
 
@@ -100,7 +100,8 @@
 
5
@@ -100,9 +100,7 @@ uninstall-local:
6
6
 
7
7
 check:
8
8
 manual.txt: manual.html
9
9
-       -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \
10
 
+       links.main -dump $< > $@ || links -dump $< > $@ || \
11
 
+       LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \
12
 
        LC_ALL=C w3m -dump manual.html > $@ || \
13
 
        LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
14
 
 
15
 
@@ -114,10 +115,10 @@
 
10
-       LC_ALL=C w3m -dump manual.html > $@ || \
 
11
-       LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
 
12
+       LC_ALL=C elinks -dump -dump-charset utf8 -no-numbering -no-references $< > $@
 
13
 
 
14
 Muttrc: stamp-doc-rc
 
15
 
 
16
@@ -114,10 +112,10 @@ stamp-doc-rc: $(top_srcdir)/init.h maked
16
17
        touch stamp-doc-rc
17
18
 
18
19
 manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css