diff options
Diffstat (limited to 'help')
-rw-r--r-- | help/Makefile.am | 11 | ||||
-rw-r--r-- | help/Makefile.nmake | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/help/Makefile.am b/help/Makefile.am index a420b9a9d9..ec4da12989 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -43,13 +43,8 @@ CLEANFILES = faq.txt MAINTAINERCLEANFILES = \ Makefile.in -# Try our best to convert the FAQ to text. -# The output of html2text.py isn't as pretty as elinks, links, or lynx. If that ever changes, we -# can use it exclusively. +# Convert the FAQ to text. faq.txt: $(srcdir)/faq.py - $(AM_V_GEN)$(srcdir)/faq.py >$@.tmp && \ - command -v elinks > /dev/null && elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ || \ - command -v links > /dev/null && links -width 72 -html-numbered-links 0 -dump $@.tmp > $@ || \ - command -v lynx > /dev/null && lynx -dump -width=72 -nolist -stdin -force-html < $@.tmp > $@ || \ - $(srcdir)/../tools/html2text.py --width=72 --no-links $@.tmp > $@ && \ + $(AM_V_GEN)$(srcdir)/faq.py -b >$@.tmp && \ + $(srcdir)/../tools/html2text.py $@.tmp > $@ && \ rm -f $@.tmp diff --git a/help/Makefile.nmake b/help/Makefile.nmake index 3eee3bcee7..b8f75540f8 100644 --- a/help/Makefile.nmake +++ b/help/Makefile.nmake @@ -10,7 +10,7 @@ include ..\config.nmake all: faq.txt faq.txt: faq.py - $(PYTHON) faq.py | $(HTML2TXT) > $@ + $(PYTHON) faq.py -b | $(PYTHON) $(TOOLS_DIR)\html2text.py > $@ clean: rm -rf faq.txt |