From f49377e0e7be6ef7d30ff1dfe685b079ef06249f Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 17 Dec 2008 19:49:18 +0000
Subject: Update html2text.py to suit our needs. Add spaces in the faq.txt
 target so to fix a problem with OS X 10.4. Add html2text.py to the end of the
 faq.txt target.

svn path=/trunk/; revision=27040
---
 help/Makefile.am | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'help')

diff --git a/help/Makefile.am b/help/Makefile.am
index 7ae2993a3e..3d3ffe0213 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -42,10 +42,12 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 # Try our best to convert the FAQ to text.
-# Maybe we should use a script (e.g. http://www.aaronsw.com/2002/html2text/) instead.
+# The output of html2text.py isn't as pretty as elinks, links, or lynx. If that ever changes, we
+# can use it exclusively.
 faq.txt: $(srcdir)/faq.py
 	$(srcdir)/faq.py >$@.tmp && \
-	(( which elinks > /dev/null && elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ )|| \
-	 ( which links  > /dev/null && links -width 72 -html-numbered-links 0 -dump               $@.tmp > $@ )|| \
-	 ( which lynx   > /dev/null && lynx -dump -width=72 -nolist -stdin -force-html          < $@.tmp > $@ )  ) && \
+	(( which elinks > /dev/null && elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ ) || \
+	 ( which links  > /dev/null && links -width 72 -html-numbered-links 0 -dump               $@.tmp > $@ ) || \
+	 ( which lynx   > /dev/null && lynx -dump -width=72 -nolist -stdin -force-html          < $@.tmp > $@ ) || \
+         $(srcdir)/../tools/html2text.py --width=72 --no-links $@.tmp > $@ ) && \
 	rm -f $@.tmp
-- 
cgit v1.2.1