This fixes bug #688, and allows the use of either docbook2html or db2html (same thing for pdf and ps). Todo: Split the doc target in wine-doc and the four guides (wine-user, wine-devel, winelib-user, wine-pkg), so they can be built individually rather than only wine-doc (inspired by make_winehq). Changelog: Check for the name of the installed docbook -> html, docbook -> pdf and docbook -> ps converters. Specify the use of our dsl for the html conversion. Vincent
Index: configure.ac =================================================================== RCS file: /home/wine/wine/configure.ac,v retrieving revision 1.90 diff -u -r1.90 configure.ac --- configure.ac 8 Nov 2002 19:34:52 -0000 1.90 +++ configure.ac 10 Nov 2002 06:00:25 -0000 @@ -101,6 +101,18 @@ AC_SUBST(LINT) AC_SUBST(LINTFLAGS) +dnl Check for db2html +AC_CHECK_PROGS(DB2HTML, docbook2html db2html, false) +AC_SUBST(DB2HTML) + +dnl Check for db2pdf +AC_CHECK_PROGS(DB2PDF, docbook2pdf db2pdf, false) +AC_SUBST(DB2PDF) + +dnl Check for db2ps +AC_CHECK_PROGS(DB2PS, docbook2ps db2ps, false) +AC_SUBST(DB2PS) + dnl **** Check for some libraries **** dnl Check for -lm Index: documentation/Makefile.in =================================================================== RCS file: /home/wine/wine/documentation/Makefile.in,v retrieving revision 1.24 diff -u -r1.24 Makefile.in --- documentation/Makefile.in 17 Sep 2002 18:44:46 -0000 1.24 +++ documentation/Makefile.in 10 Nov 2002 06:00:26 -0000 @@ -4,7 +4,9 @@ VPATH = @srcdir@ MODULE = none BOOKNAME = wine-doc -DB2HTML = db2html +DB2HTML = @DB2HTML@ +DB2PDF = @DB2PDF@ +DB2PS = @DB2PS@ EXTRASUBDIRS = samples status @@ -65,13 +67,13 @@ .PHONY: everything doc html pdf ps $(BOOKNAME)/index.html: $(BOOK_SRCS) - $(DB2HTML) $(BOOKNAME).sgml + $(DB2HTML) -d default.dsl -o $(BOOKNAME) $(BOOKNAME).sgml $(BOOKNAME).pdf: $(BOOK_SRCS) - db2pdf -d ./print.dsl $(BOOKNAME).sgml > /dev/null + $(DB2PDF) -d print.dsl $(BOOKNAME).sgml > /dev/null $(BOOKNAME).ps: $(BOOK_SRCS) - db2ps $(BOOKNAME).sgml > /dev/null + $(DB2PS) $(BOOKNAME).sgml > /dev/null 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) $@
