On Jan 18, 2001, Joerg Mayer <[EMAIL PROTECTED]> wrote:
>
> On Thu, Jan 18, 2001 at 09:09:35AM -0600, Jeremy White wrote:
> > then documentation/wine-doc contains a nice set of HTML pages that
> > can be used by the user (or tarballed into an RPM <g>).
>
> I've had problems building the documentation on a SuSE 7.0 (not solved).
> I think providing a Text version with the Sources would be nice - IMO it's
> comparable to providing configure in addition to configure.in
The attached patch fixes this problem, but I'm not sure about using
the conditional in documentation/Makefile.in. I'm pretty sure that's
a GNU Make-specific feature (I could be wrong about that, tho). Are
the Wine makefiles already GNU-specific? If so, then this patch can
probably go in. If not, then what's the standard way to do
conditional compiling in Wine?
Here's the questionable bit:
## Makefile conditionals (GNU-specific??)
ifdef DB2HTML
BOOK_TARGETS = \
$(BOOKNAME)/index.html \
$(BOOKNAME).pdf \
$(BOOKNAME).ps
else
BOOK_TARGETS =
endif
NOTE: You'll want to run autoconf before reconfiguring Wine.
Unfortunately since the patch adds a block of code to an early
part of the configure script, and autoconf hardwires line
numbers into the configure script, the extra diff noise turns
the patch from a nice 1K patch into an 88K monster. /c:
ChangeLog:
Make DocBook doc building conditional on the existance of db2html.
John
--
[EMAIL PROTECTED] http://www.gnome.org
[EMAIL PROTECTED] http://www.worldforge.org
[EMAIL PROTECTED] http://openbooks.sourceforge.net
http://advogato.org/person/jsheets
Writing Gnome Applications
http://www.aw.com/cseng/titles/0-201-65791-0/
Index: configure.in
===================================================================
RCS file: /home/wine/wine/configure.in,v
retrieving revision 1.189
diff -u -r1.189 configure.in
--- configure.in 2001/01/12 23:07:12 1.189
+++ configure.in 2001/01/19 18:14:00
@@ -71,6 +71,10 @@
AC_CYGWIN
AC_CHECK_PROG(DLLWRAP,dllwrap,dllwrap,false)
+dnl Check for db2html script, for DocBook processing
+AC_CHECK_PROGS(DB2HTML,db2html)
+AC_SUBST(DB2HTML)
+
dnl Check for lint
AC_CHECK_PROGS(LINT, lclint lint)
if test "$LINT" = "lint"
Index: documentation/Makefile.in
===================================================================
RCS file: /home/wine/wine/documentation/Makefile.in,v
retrieving revision 1.14
diff -u -r1.14 Makefile.in
--- documentation/Makefile.in 2001/01/11 22:32:44 1.14
+++ documentation/Makefile.in 2001/01/19 18:14:39
@@ -4,7 +4,7 @@
VPATH = @srcdir@
MODULE = none
BOOKNAME = wine-doc
-DB2HTML = db2html
+DB2HTML = @DB2HTML@
EXTRASUBDIRS = samples status
@@ -37,10 +37,15 @@
tools.sgml \
wine-doc.sgml
+## Makefile conditionals (GNU-specific??)
+ifdef DB2HTML
BOOK_TARGETS = \
$(BOOKNAME)/index.html \
$(BOOKNAME).pdf \
$(BOOKNAME).ps
+else
+BOOK_TARGETS =
+endif
all: $(BOOK_TARGETS)
