On Wed, 8 Oct 2003, Alexandre Julliard wrote:
> Actually it seems there is now (finally) a docbook2txt tool, we should
> probably use that instead.
Indeed.
ChangeLog
Dimitrie O. Paun <dpaun@rogers.com>
Use docbook2txt to generate the text output instead of adhoc hacks.
Index: configure.ac
===================================================================
RCS file: /var/cvs/wine/configure.ac,v
retrieving revision 1.184
diff -u -r1.184 configure.ac
--- configure.ac 7 Oct 2003 22:49:22 -0000 1.184
+++ configure.ac 8 Oct 2003 18:57:53 -0000
@@ -121,6 +121,10 @@
AC_CHECK_PROGS(DB2PS, docbook2ps db2ps, false)
AC_SUBST(DB2PS)
+dnl Check for db2txt
+AC_CHECK_PROGS(DB2TXT, docbook2txt db2txt, false)
+AC_SUBST(DB2TXT)
+
dnl **** Check for some libraries ****
dnl Check for -lm
Index: documentation/Makefile.in
===================================================================
RCS file: /var/cvs/wine/documentation/Makefile.in,v
retrieving revision 1.39
diff -u -r1.39 Makefile.in
--- documentation/Makefile.in 2 Oct 2003 04:28:17 -0000 1.39
+++ documentation/Makefile.in 8 Oct 2003 19:08:10 -0000
@@ -6,6 +6,7 @@
DB2HTML = @DB2HTML@
DB2PDF = @DB2PDF@
DB2PS = @DB2PS@
+DB2TXT = @DB2TXT@
EXTRASUBDIRS = samples
@@ -61,10 +62,11 @@
@MAKE_RULES@
everything: $(MAN_TARGETS) doc
-doc: html pdf ps
+doc: html pdf ps txt
html: $(ALLBOOKS:%=%.html) wine-faq.html
pdf: $(ALLBOOKS:%=%.pdf)
ps: $(ALLBOOKS:%=%.ps)
+txt: $(ALLBOOKS:%=%.txt)
.PHONY: everything doc html pdf ps dist
@@ -79,13 +81,13 @@
.sgml.ps:
$(DB2PS) $<
-.html.txt:
- w3m -dump $< > $@ || ($(RM) $@ && false)
+.sgml.txt:
+ $(DB2TXT) $<
-wine-devel.pdf wine-devel.ps wine-devel.html: $(WINE_DEVEL_SRCS)
-wine-user.pdf wine-user.ps wine-user.html: $(WINE_USER_SRCS)
-wine-faq.pdf wine-faq.ps wine-faq.html: $(WINE_FAQ_SRCS)
-winelib-user.pdf winelib-user.ps winelib-user.html: $(WINELIB_USER_SRCS)
+wine-devel.pdf wine-devel.ps wine-devel.html wine-devel.txt: $(WINE_DEVEL_SRCS)
+wine-user.pdf wine-user.ps wine-user.html wine-user.txt: $(WINE_USER_SRCS)
+wine-faq.pdf wine-faq.ps wine-faq.html wine-faq.txt: $(WINE_FAQ_SRCS)
+winelib-user.pdf winelib-user.ps winelib-user.html winelib-user.txt: $(WINELIB_USER_SRCS)
wine.man: wine.man.in
sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.man.in >$@ || ($(RM) $@ && false)
--
Dimi.
