From nobody@FreeBSD.org  Sat Dec 10 02:18:46 2005
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8675916A41F
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Dec 2005 02:18:46 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 30F8043D5E
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Dec 2005 02:18:46 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id jBA2IhLN054055
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Dec 2005 02:18:43 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id jBA2IhRD054018;
	Sat, 10 Dec 2005 02:18:43 GMT
	(envelope-from nobody)
Message-Id: <200512100218.jBA2IhRD054018@www.freebsd.org>
Date: Sat, 10 Dec 2005 02:18:43 GMT
From: Intron <intron@intron.ac>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Modification Requirement for doc/share/mk/doc.docbook.mk
X-Send-Pr-Version: www-2.3

>Number:         90171
>Category:       docs
>Synopsis:       Modification Requirement for doc/share/mk/doc.docbook.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 10 02:20:02 GMT 2005
>Closed-Date:    Sat Dec 10 14:03:17 GMT 2005
>Last-Modified:  Sat Dec 10 14:03:17 GMT 2005
>Originator:     Intron
>Release:        7.0-CURRENT
>Organization:
Tsinghua University
>Environment:
FreeBSD celeron 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Thu Nov 10 18:26:33 CST 2005     root@celeron:/usr/obj/usr/src/sys/my  i386
>Description:
1. After I build PDF and PS formats of books and articles, I cannot remove
   book.out or article.out by "make clean".
2. We Chinese document translation team needs Chinese-specific Makefile target
   ${DOC}.pdf, ${DOC}.dvi and ${DOC}.txt. And we would override these targets
   in doc/zh_CN.GB2312/share/mk/doc.local.mk. Thus, appropriate wrappers around
   target ${DOC}.dvi and ${DOC}.txt in doc/share/mk/doc.docbook.mk are required.

        For more information, please contact Chinese FreeBSD committee Li, Xin
   <delphij@FreeBSD.org> or me.
>How-To-Repeat:
              
>Fix:
Index: doc.docbook.mk
===================================================================
RCS file: /cvsroot/ncvs/doc/share/mk/doc.docbook.mk,v
retrieving revision 1.121
diff -u -r1.121 doc.docbook.mk
--- doc.docbook.mk	23 Sep 2005 19:38:22 -0000	1.121
+++ doc.docbook.mk	9 Dec 2005 16:21:41 -0000
@@ -352,13 +352,13 @@
 CLEANFILES+= ${DOC}.html-text
 
 .elif ${_cf} == "dvi"
-CLEANFILES+= ${DOC}.aux ${DOC}.log ${DOC}.tex
+CLEANFILES+= ${DOC}.aux ${DOC}.log ${DOC}.out ${DOC}.tex
 
 .elif ${_cf} == "tex"
 CLEANFILES+= ${DOC}.aux ${DOC}.log
 
 .elif ${_cf} == "ps"
-CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.tex-ps ${DOC}.tex
+CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps ${DOC}.tex
 .for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
 CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
 .endfor
@@ -525,8 +525,10 @@
 
 # TXT --------------------------------------------------------------------
 
+.if !target(${DOC}.txt)
 ${DOC}.txt: ${DOC}.html-text
 	${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET}
+.endif	
 
 # PDB --------------------------------------------------------------------
 
@@ -591,6 +593,7 @@
 		${JADEOPTS} -t tex -o /dev/stdout ${MASTERDOC} >> ${.TARGET}
 .endif
 
+.if !target(${DOC}.dvi)
 ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
 .for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
 	${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
@@ -601,6 +604,7 @@
 	-${JADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex}'
 	@${ECHO} "==> TeX pass 3/3"
 	-${JADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex}'
+.endif
 
 .if !target(${DOC}.pdf)
 ${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF}

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->delphij 
Responsible-Changed-By: delphij 
Responsible-Changed-When: Sat Dec 10 13:39:37 UTC 2005 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90171 
State-Changed-From-To: open->closed 
State-Changed-By: delphij 
State-Changed-When: Sat Dec 10 14:02:56 UTC 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90171 
>Unformatted:
