From owner-freebsd-doc@FreeBSD.ORG Fri Nov 7 11:21:48 2003 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49F9E16A4CE for ; Fri, 7 Nov 2003 11:21:48 -0800 (PST) Received: from basement.kutulu.org (pcp03610121pcs.longhl01.md.comcast.net [68.49.239.235]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7057343F93 for ; Fri, 7 Nov 2003 11:21:47 -0800 (PST) (envelope-from kutulu@kutulu.org) Received: from wombat.localnet (wombat.localnet [192.168.69.3]) by basement.kutulu.org (Postfix) with ESMTP id DB562AA36 for ; Fri, 7 Nov 2003 14:21:43 -0500 (EST) Received: by wombat.localnet (Postfix, from userid 1001) id E1D68B855; Fri, 7 Nov 2003 14:21:03 -0500 (EST) Date: Fri, 7 Nov 2003 14:21:03 -0500 From: Michael Edenfield To: freebsd-doc@freebsd.org Message-ID: <20031107192103.GC44915@wombat.localnet> References: <20031107184212.GB44915@wombat.localnet> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="w7PDEPdKQumQfZlR" Content-Disposition: inline In-Reply-To: <20031107184212.GB44915@wombat.localnet> X-Mailer: Mutt http://www.mutt.org/ X-Accept-Language: en X-PGP-Key: http://www.kutulu.org/pgp/kutulu.asc X-PGP-Fingerprint: 1CE0 3C31 7013 D529 406D 37DC 09CC CD84 A46C 878F User-Agent: Mutt/1.5.4i Subject: Re: Does XML Docbook work with the /usr/doc makefiles? X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2003 19:21:48 -0000 --w7PDEPdKQumQfZlR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Michael Edenfield [031107 13:42]: > DOC =3D book > DOCBOOKSUFFIX =3D .xml > SRCS =3D book.xml \ > part1/magnetism.xml part1/energy.xml part1/matter.xml \ > part1/emf.xml part1/conservation.xml \ > part2/acdc.xml \ > biblio/biblio.xml > STYLESHEET_TYPE =3D xsl > FORMATS =3D html html-split >=20 > .include "/usr/doc/share/mk/doc.project.mk" Apparently the problem was more obvious than I thought. doc.docbook.mk has a target if ${DOC}.xml which is always built, and depends on ${SRCS}. I assume this is to allow automatic conversion of SGML -> XML so that the XSL style sheets can be applied. Obviously if your SRCS includes ${DOC}.xml this doesn't work. The fix is simple: --- doc.docbook.mk.orig Fri Nov 7 14:19:33 2003 +++ doc.docbook.mk Fri Nov 7 14:19:47 2003 @@ -421,10 +421,14 @@ # # Better approaches to handling this would be most welcome =20 +# If our master doc is already ${DOC}.xml then we don't need this next=20 +# part. In fact, it causes a circular graph reference. +.if ${SRCS:M${DOC}.xml} =3D=3D "" ${DOC}.xml: ${SRCS} echo '' > ${DOC}.xml ${SX} -xlower -xndata ${MASTERDOC} 2> .sxerr | tail -n +2 >> ${DOC}.xml= =20 @-grep -v 'reference to internal SDATA entity' .sxerr +.endif =20 # HTML-SPLIT ------------------------------------------------------------- =20 --w7PDEPdKQumQfZlR Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQE/q/CfCczNhKRsh48RApUiAKCFFjyHG6UpCAQpf89XeV01GsISOACgsF0Y 8vRcTAwgSI7M7JSEHlXuUiQ= =1sAN -----END PGP SIGNATURE----- --w7PDEPdKQumQfZlR--