From nbm@mithrandr.moria.org Wed Aug 25 13:02:08 1999
Return-Path: <nbm@mithrandr.moria.org>
Received: from buffalo.ru.ac.za (buffalo.ru.ac.za [146.231.128.3])
	by hub.freebsd.org (Postfix) with ESMTP id 3A0EC14CCF
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 25 Aug 1999 13:01:49 -0700 (PDT)
	(envelope-from nbm@mithrandr.moria.org)
Received: from duca.dialup.ru.ac.za ([146.231.98.24] helo=mithrandr.moria.org)
	by buffalo.ru.ac.za with esmtp (Exim 3.03 #2)
	id 11JjEm-0005PN-00
	for FreeBSD-gnats-submit@freebsd.org; Wed, 25 Aug 1999 22:01:37 +0200
Received: (qmail 86659 invoked by uid 1001); 25 Aug 1999 19:17:26 -0000
Message-Id: <19990825191726.86658.qmail@mithrandr.moria.org>
Date: 25 Aug 1999 19:17:26 -0000
From: nbm@rucus.ru.ac.za
Sender: nbm@mithrandr.moria.org
Reply-To: nbm@rucus.ru.ac.za
To: FreeBSD-gnats-submit@freebsd.org
Subject: add obj'ability to doc build
X-Send-Pr-Version: 3.2

>Number:         13379
>Category:       docs
>Synopsis:       add obj'ability to doc build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 25 13:10:00 PDT 1999
>Closed-Date:    Sun Oct 3 20:38:49 PDT 1999
>Last-Modified:  Sun Oct  3 20:39:25 PDT 1999
>Originator:     Neil Blakey-Milner
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
Rhodes University Computer Users' Society
>Environment:

FreeBSD mithrandr.moria.org 4.0-CURRENT FreeBSD 4.0-CURRENT #0: Sat Aug  7 11:34:36 SAST 1999     root@mithrandr.moria.org:/usr/src/sys/compile/MITHRANDR  i386

>Description:

Add ability to use obj-related abilities to the doc build.  This'll help
with read-only trees, and all sorts of other funky things.

>How-To-Repeat:

make obj all

>Fix:

cvs diff: Diffing .
Index: docproj.docbook.mk
===================================================================
RCS file: /home/nbm/ncvs/doc/share/mk/docproj.docbook.mk,v
retrieving revision 1.9
diff -u -r1.9 docproj.docbook.mk
--- docproj.docbook.mk	1999/08/19 00:07:09	1.9
+++ docproj.docbook.mk	1999/08/25 17:00:29
@@ -76,6 +76,7 @@
 .endif
 
 DOC?=		${.CURDIR:T}
+MASTERDOC?=	${.CURDIR}/${DOC}.sgml
 
 DOC_INSTALL_PREFIX?= /usr/local/share/doc/fdp
 
@@ -223,49 +224,49 @@
 all: ${_docs}
 
 index.html HTML.manifest: ${SRCS}
-	${JADE} -V html-manifest -ioutput.html ${JADEOPTS} -d ${DSLHTML} -t sgml ${DOC}.sgml
+	${JADE} -V html-manifest -ioutput.html ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC}
 	-tidy -i -m -f /dev/null ${TIDYFLAGS} *.html
 
 ${DOC}.html: ${SRCS}
-	${JADE} -ioutput.html -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${DOC}.sgml > ${DOC}.html
-	-tidy -i -m -f /dev/null ${TIDYFLAGS} ${DOC}.html
+	${JADE} -ioutput.html -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > ${.TARGET}
+	-tidy -i -m -f /dev/null ${TIDYFLAGS} ${.TARGET}
 
 ${DOC}.html-split.tar: HTML.manifest
 	tar cf ${.TARGET} `xargs < HTML.manifest`
 
 ${DOC}.txt: ${DOC}.html
-	lynx -nolist -dump ${DOC}.html > ${DOC}.txt
+	lynx -nolist -dump ${.ALLSRC} > ${.TARGET}
 
 ${DOC}.rtf: ${SRCS}
-	${JADE} -Vrtf-backend -ioutput.print ${JADEOPTS} -d ${DSLPRINT} -t rtf ${DOC}.sgml
+	${JADE} -Vrtf-backend -ioutput.print ${JADEOPTS} -d ${DSLPRINT} -t rtf -o ${.TARGET} ${MASTERDOC}
 
 ${DOC}.doc: ${SRCS}
-	${JADE} -ioutput.print ${JADEOPTS} -d ${DSLPRINT} -t doc ${DOC}.sgml
+	${JADE} -ioutput.print ${JADEOPTS} -d ${DSLPRINT} -t doc -o ${.TARGET} ${MASTERDOC}
 
 ${DOC}.tex: ${SRCS}
-	${JADE} -Vtex-backend -ioutput.print ${JADEOPTS} -d ${DSLPRINT} -t tex ${DOC}.sgml
+	${JADE} -Vtex-backend -ioutput.print ${JADEOPTS} -d ${DSLPRINT} -t tex -o ${.TARGET} ${MASTERDOC}
 
 ${DOC}.dvi: ${DOC}.tex
 	@echo "==> TeX pass 1/3"
-	-tex "&jadetex" ${DOC}.tex
+	-tex "&jadetex" ${.ALLSRC}
 	@echo "==> TeX pass 2/3"
-	-tex "&jadetex" ${DOC}.tex
+	-tex "&jadetex" ${.ALLSRC}
 	@echo "==> TeX pass 3/3"
-	-tex "&jadetex" ${DOC}.tex
+	-tex "&jadetex" ${.ALLSRC}
 
 ${DOC}.pdf: ${DOC}.tex
 	@echo "==> PDFTeX pass 1/3"
-	-pdftex "&pdfjadetex" ${DOC}.tex
+	-pdftex "&pdfjadetex" ${.ALLSRC}
 	@echo "==> PDFTeX pass 2/3"
-	-pdftex "&pdfjadetex" ${DOC}.tex
+	-pdftex "&pdfjadetex" ${.ALLSRC}
 	@echo "==> PDFTeX pass 3/3"
-	pdftex "&pdfjadetex" ${DOC}.tex
+	pdftex "&pdfjadetex" ${.ALLSRC}
 
 ${DOC}.ps: ${DOC}.dvi
-	dvips -o ${DOC}.ps ${DOC}.dvi
+	dvips -o ${.TARGET} ${.ALLSRC}
 
-${DOC}.tar:
-	tar cf ${.TARGET} ${SRCS}
+${DOC}.tar: ${SRCS}
+	tar cf ${.TARGET} ${.ALLSRC}
 
 # ------------------------------------------------------------------------
 #

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: jkoshy 
State-Changed-When: Sun Oct 3 20:38:49 PDT 1999 
State-Changed-Why:  
Closed at originators request. 
Message-ID: <19991003140217.A25628@rucus.ru.ac.za> 
on freebsd-doc. 
>Unformatted:
