From amorita@misao.kuicr.kyoto-u.ac.jp  Thu Nov  1 22:18:50 2001
Return-Path: <amorita@misao.kuicr.kyoto-u.ac.jp>
Received: from misao.kuicr.kyoto-u.ac.jp (misao.kuicr.kyoto-u.ac.jp [133.3.28.70])
	by hub.freebsd.org (Postfix) with SMTP id 4F21737B401
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Nov 2001 22:18:49 -0800 (PST)
Received: (qmail 76755 invoked by uid 1000); 2 Nov 2001 15:18:42 +0900
Message-Id: <20011102061842.76722.qmail@misao.kuicr.kyoto-u.ac.jp>
Date: 2 Nov 2001 15:18:42 +0900
From: Akio Morita <amorita@FreeBSD.org>
Reply-To: Akio Morita <amorita@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: TIDYFLAGS cann't work correctly
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         31703
>Category:       docs
>Synopsis:       TIDYFLAGS cann't work correctly
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 01 22:20:03 PST 2001
>Closed-Date:    Mon Nov 5 02:33:56 PST 2001
>Last-Modified:  Mon Nov 05 02:34:17 PST 2001
>Originator:     Akio Morita
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
Department of Physics, Kyoto University, Japan
>Environment:
System: FreeBSD sasami.jyurai 4.4-STABLE FreeBSD 4.4-STABLE #1: Mon Oct 29 04:41:39 JST 2001 amorita@sasami.jyurai:/usr/SRC/src/sys/compile/SASAMI i386

>Description:
In comment of doc module, TIDYFLAGS is `Additional flags to pass to Tidy'.
Before import of Cryrille's patch, action of TIDYFLAGS accorded its comment,
and TIDYFLAGS is used in some language sub-directory.
In old make template, tidy called by following style.
 tidy -i -m -f /dev/null ${TIDYFLAGS} `xargs < HTML.manifest`.
-- list of Makefiles using TIDYFLAGS --
% find /usr/doc -name Makefile\* -exec grep TIDYFLAGS /dev/null {} \;
/usr/doc/ja_JP.eucJP/articles/Makefile.inc:TIDYFLAGS=      -raw
/usr/doc/ja_JP.eucJP/books/Makefile.inc:TIDYFLAGS=      -raw
/usr/doc/ru_RU.KOI8-R/books/Makefile.inc:TIDYFLAGS=     -latin1
/usr/doc/ru_RU.KOI8-R/articles/Makefile.inc:TIDYFLAGS=  -latin1
/usr/doc/zh_TW.Big5/books/faq/Makefile:TIDYFLAGS=      -raw
/usr/doc/de_DE.ISO8859-1/books/Makefile.inc:TIDYFLAGS=  -latin1
/usr/doc/nl_NL.ISO8859-1/books/Makefile.inc:TIDYFLAGS=  -latin1
/usr/doc/sr_YU.ISO8859-2/articles/Makefile.inc:TIDYFLAGS=   -raw
/usr/doc/sr_YU.ISO8859-2/books/Makefile.inc:TIDYFLAGS=   -raw
-- list of Makefiles using TIDYFLAGS --

After import of Cryrille's patch, TIDYFLAGS defines at doc.docbook.mk
and doc.html.mk as following style.
 TIDYFLAGS?=    -i -m -f /dev/null

Therefore, in building html document using TIDYFLAGS,
tidy option `-i -m -f /dev/null' is forgot.
Thus TIDY outputs revised html doeucment to stdout
and html documents on disk are not revised.

>How-To-Repeat:
Checkout doc module and build html document using TIDYFLAGS.

--- example ---
% cd /usr/doc/de_DE.ISO8859-1/books/faq
% make
/usr/bin/touch index.sgml
/bin/cp -p /usr/doc/de_DE.ISO8859-1/books/faq/../../../share/misc/docbook.css docbook.css
/usr/local/bin/jade -V html-manifest -ioutput.html -d /usr/doc/de_DE.ISO8859-1/books/faq/../../../share/sgml/default.dsl  -ioutput.html.images  -Vbiblio-xref-title -D /usr/obj/usr/doc/de_DE.ISO8859-1/books/faq -c /usr/doc/de_DE.ISO8859-1/books/faq/../../../de_DE.ISO8859-1/share/sgml/catalog -c /usr/doc/de_DE.ISO8859-1/books/faq/../../../share/sgml/catalog  -c /usr/local/share/sgml/docbook/dsssl/modular/catalog -c /usr/local/share/sgml/docbook/catalog  -c /usr/local/share/sgml/jade/catalog  -t sgml /usr/doc/de_DE.ISO8859-1/books/faq/book.sgml
/usr/local/bin/tidy -latin1 $(/usr/bin/xargs < HTML.manifest)

Tidy (vers 4th August 2000) Parsing "index.html"
line 71 column 2 - Warning: trimming empty <p>
line 111 column 2 - Warning: trimming empty <p>

index.html: Document content looks like HTML 4.01 Transitional
2 warnings/errors were found!


Tidy (vers 4th August 2000) Parsing "introduction.html"
line 334 column 2 - Warning: missing </div> before <li>
line 334 column 2 - Warning: inserting implicit <ul>
line 356 column 2 - Warning: discarding unexpected </p>
line 357 column 2 - Warning: missing <li>
line 373 column 2 - Warning: missing </ul> before </div>
line 528 column 2 - Warning: trimming empty <p>
line 787 column 2 - Warning: trimming empty <p>
line 940 column 2 - Warning: trimming empty <p>
line 1148 column 2 - Warning: trimming empty <p>
line 1179 column 2 - Warning: trimming empty <p>
line 1180 column 2 - Warning: <table> lacks "summary" attribute
line 1290 column 2 - Warning: trimming empty <p>
line 1317 column 2 - Warning: trimming empty <p>
line 1318 column 2 - Warning: <table> lacks "summary" attribute
line 1473 column 2 - Warning: trimming empty <p>
line 1482 column 2 - Warning: trimming empty <p>
line 1515 column 8 - Warning: nested emphasis <tt>
line 1540 column 2 - Warning: trimming empty <p>
line 1541 column 2 - Warning: <table> lacks "summary" attribute
line 1626 column 2 - Warning: trimming empty <p>
line 1694 column 2 - Warning: nested emphasis <tt>
line 1871 column 2 - Warning: trimming empty <p>
line 1932 column 2 - Warning: trimming empty <p>
line 1963 column 2 - Warning: trimming empty <p>

introduction.html: Document content looks like HTML 4.01 Transitional
24 warnings/errors were found!

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta name="generator" content="HTML Tidy, see www.w3.org">
--- example ---

>Fix:
Apply following patch.

--- patch ---
Index: share/mk/doc.docbook.mk
===================================================================
RCS file: /CVSrepository/FreeBSD/doc/share/mk/doc.docbook.mk,v
retrieving revision 1.53
diff -d -u -r1.53 doc.docbook.mk
--- share/mk/doc.docbook.mk	2001/10/30 21:37:31	1.53
+++ share/mk/doc.docbook.mk	2001/11/02 05:08:00
@@ -174,7 +174,6 @@
 TEX?=		${PREFIX}/bin/tex
 PDFTEX?=	${PREFIX}/bin/pdftex
 TIDY?=		${PREFIX}/bin/tidy
-TIDYFLAGS?=	-i -m -f /dev/null
 HTML2TXT?=	${PREFIX}/bin/links
 HTML2TXTFLAGS?=	-dump
 HTML2PDB?=	${PREFIX}/bin/iSiloBSD
@@ -342,7 +341,7 @@
 	${JADE} -V html-manifest ${HTMLOPTS} -ioutput.html.images \
 		${JADEOPTS} -t sgml ${MASTERDOC}
 .if !defined(NO_TIDY)
-	-${TIDY} ${TIDYFLAGS} $$(${XARGS} < HTML.manifest)
+	-${TIDY} -i -m -f /dev/null ${TIDYFLAGS} $$(${XARGS} < HTML.manifest)
 .endif
 
 ${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
@@ -351,7 +350,7 @@
 		${JADEOPTS} -t sgml ${MASTERDOC} > ${.TARGET} || \
 		(${RM} -f ${.TARGET} && false)
 .if !defined(NO_TIDY)
-	-${TIDY} ${TIDYFLAGS} ${.TARGET}
+	-${TIDY} -i -m -f /dev/null ${TIDYFLAGS} ${.TARGET}
 .endif
 
 # Special target to produce HTML with no images in it.
Index: share/mk/doc.html.mk
===================================================================
RCS file: /CVSrepository/FreeBSD/doc/share/mk/doc.html.mk,v
retrieving revision 1.9
diff -d -u -r1.9 doc.html.mk
--- share/mk/doc.html.mk	2001/10/29 09:21:31	1.9
+++ share/mk/doc.html.mk	2001/11/02 05:08:00
@@ -62,13 +62,12 @@
 NSGMLS?=	${PREFIX}/bin/nsgmls
 SGMLNORM?=	${PREFIX}/bin/sgmlnorm
 .endif
- 
+
 PKG_CREATE?=	/usr/sbin/pkg_create
 TAR?=		/usr/bin/tar
 XARGS?=		/usr/bin/xargs
 
 TIDY?=		${PREFIX}/bin/tidy
-TIDYFLAGS?=	-i -m -f /dev/null
 HTML2TXT?=	${PREFIX}/bin/links
 HTML2TXTFLAGS?=	-dump
 HTML2PDB?=	${PREFIX}/bin/iSiloBSD
@@ -150,7 +149,7 @@
 ${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET}
 	${SGMLNORM} -c ${HTMLCATALOG} ${SRCS:S|^|${.CURDIR}/|} > ${.TARGET}
 .if !defined(NO_TIDY)
-	-${TIDY} ${TIDYFLAGS} ${.TARGET}
+	-${TIDY} -i -m -f /dev/null ${TIDYFLAGS} ${.TARGET}
 .endif
 
 ${DOC}.txt: ${DOC}.html
--- patch ---
>Release-Note:
>Audit-Trail:

From: Cyrille Lefevre <clefevre@citeweb.net>
To: Akio Morita <amorita@freebsd.org>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: docs/31703: TIDYFLAGS cann't work correctly
Date: Fri, 2 Nov 2001 15:32:15 +0100 (CET)

 Akio Morita wrote:
 [snip]
 > >Description:
 > In comment of doc module, TIDYFLAGS is `Additional flags to pass to Tidy'.
 > Before import of Cryrille's patch, action of TIDYFLAGS accorded its comment,
 
 Cyrille ;^)
 
 > and TIDYFLAGS is used in some language sub-directory.
 > In old make template, tidy called by following style.
 >  tidy -i -m -f /dev/null ${TIDYFLAGS} `xargs < HTML.manifest`.
 > -- list of Makefiles using TIDYFLAGS --
 > % find /usr/doc -name Makefile\* -exec grep TIDYFLAGS /dev/null {} \;
 > /usr/doc/ja_JP.eucJP/articles/Makefile.inc:TIDYFLAGS=      -raw
 > /usr/doc/ja_JP.eucJP/books/Makefile.inc:TIDYFLAGS=      -raw
 > /usr/doc/ru_RU.KOI8-R/books/Makefile.inc:TIDYFLAGS=     -latin1
 > /usr/doc/ru_RU.KOI8-R/articles/Makefile.inc:TIDYFLAGS=  -latin1
 > /usr/doc/zh_TW.Big5/books/faq/Makefile:TIDYFLAGS=      -raw
 > /usr/doc/de_DE.ISO8859-1/books/Makefile.inc:TIDYFLAGS=  -latin1
 > /usr/doc/nl_NL.ISO8859-1/books/Makefile.inc:TIDYFLAGS=  -latin1
 > /usr/doc/sr_YU.ISO8859-2/articles/Makefile.inc:TIDYFLAGS=   -raw
 > /usr/doc/sr_YU.ISO8859-2/books/Makefile.inc:TIDYFLAGS=   -raw
 > -- list of Makefiles using TIDYFLAGS --
 > 
 > After import of Cryrille's patch, TIDYFLAGS defines at doc.docbook.mk
 
 grrr, ditto.
 
 > and doc.html.mk as following style.
 >  TIDYFLAGS?=    -i -m -f /dev/null
 > 
 > Therefore, in building html document using TIDYFLAGS,
 > tidy option `-i -m -f /dev/null' is forgot.
 > Thus TIDY outputs revised html doeucment to stdout
 > and html documents on disk are not revised.
 
 it is better to add the following line to doc.docbook.mk, etc.
 
 	TIDYOPTS= -i -m -f /dev/null ${TIDYFLAGS}
 
 and to replace :
 
 	-${TIDY} ${TIDYFLAGS} $$(${XARGS} < HTML.manifest)
 by
 	-${TIDY} ${TIDYOPTS} $$(${XARGS} < HTML.manifest)
 
 to stay homogeneous w/ the rest of the Makefiles.
 
 > >How-To-Repeat:
 > Checkout doc module and build html document using TIDYFLAGS.
 [snip]
 > >Fix:
 > Apply following patch.
 
 NO, this one :P
 
 all XXXFLAGS = YYY have been changed to XXXOPTS = YYY ${XXXFLAGS}
 so, no ambiguity doesn't apply anymore.
 also, missing XXXOPTS have been added for the same reason.
 and to finish, doc.subdir.mk has been fixed to not include
 ../Makefile.inc twince (the second time occured through bsd.subdir.mk).
 
 PS : .dvi.ps rule was missing DVIPSFLAGS (now DVIPSOPTS).
 re-PS : I didn't made a full doc build because my machine is very
 slow and will take many (many) hours before everything could be done.
 
 Index: doc.docbook.mk
 ===================================================================
 RCS file: /home/ncvs/doc/share/mk/doc.docbook.mk,v
 retrieving revision 1.52
 diff -u -r1.52 doc.docbook.mk
 --- doc.docbook.mk	2001/10/29 09:21:53	1.52
 +++ doc.docbook.mk	2001/11/02 14:09:55
 @@ -174,14 +176,14 @@
  TEX?=		${PREFIX}/bin/tex
  PDFTEX?=	${PREFIX}/bin/pdftex
  TIDY?=		${PREFIX}/bin/tidy
 -TIDYFLAGS?=	-i -m -f /dev/null
 +TIDYOPTS?=	-i -m -f /dev/null ${TYDYFLAGS}
  HTML2TXT?=	${PREFIX}/bin/links
 -HTML2TXTFLAGS?=	-dump
 +HTML2TXTOPTS?=	-dump ${HTML2TXTFLAGS}
  HTML2PDB?=	${PREFIX}/bin/iSiloBSD
 -HTML2PDBFLAGS?=	-y -d0 -Idef
 +HTML2PDBOPTS?=	-y -d0 -Idef ${HTML2PDBFLAGS}
  DVIPS?=		${PREFIX}/bin/dvips
  .if defined(PAPERSIZE)
 -DVIPSFLAGS?=	-t ${PAPERSIZE:L}
 +DVIPSOPTS?=	-t ${PAPERSIZE:L} ${DVIPSFLAGS}
  .endif
  
  GZIP?=	-9
 @@ -342,7 +344,7 @@
  	${JADE} -V html-manifest ${HTMLOPTS} -ioutput.html.images \
  		${JADEOPTS} -t sgml ${MASTERDOC}
  .if !defined(NO_TIDY)
 -	-${TIDY} ${TIDYFLAGS} $$(${XARGS} < HTML.manifest)
 +	-${TIDY} ${TIDYOPTS} $$(${XARGS} < HTML.manifest)
  .endif
  
  ${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
 @@ -351,7 +353,7 @@
  		${JADEOPTS} -t sgml ${MASTERDOC} > ${.TARGET} || \
  		(${RM} -f ${.TARGET} && false)
  .if !defined(NO_TIDY)
 -	-${TIDY} ${TIDYFLAGS} ${.TARGET}
 +	-${TIDY} ${TIDYOPTS} ${.TARGET}
  .endif
  
  # Special target to produce HTML with no images in it.
 @@ -371,10 +373,10 @@
  		${LOCAL_IMAGES_LIB} ${IMAGES_PNG} ${CSS_SHEET:T}
  
  ${DOC}.txt: ${DOC}.html-text
 -	${HTML2TXT} ${HTML2TXTFLAGS} ${.ALLSRC} > ${.TARGET}
 +	${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET}
  
  ${DOC}.pdb: ${DOC}.html ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
 -	${HTML2PDB} ${HTML2PDBFLAGS} ${DOC}.html ${.TARGET}
 +	${HTML2PDB} ${HTML2PDBOPTS} ${DOC}.html ${.TARGET}
  
  ${.CURDIR:T}.pdb: ${DOC}.pdb
  	${LN} -f ${.ALLSRC} ${.TARGET}
 @@ -426,7 +428,7 @@
  	${PDFTEX} "&pdfjadetex" '\nonstopmode\input{${DOC}.dvi}'
  
  ${DOC}.ps: ${DOC}.dvi
 -	${DVIPS} -o ${.TARGET} ${.ALLSRC}
 +	${DVIPS} ${DVIPSOPTS} -o ${.TARGET} ${.ALLSRC}
  
  ${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET}
  	${TAR} cf ${.TARGET} -C ${.CURDIR} ${SRCS} \
 Index: doc.html.mk
 ===================================================================
 RCS file: /home/ncvs/doc/share/mk/doc.html.mk,v
 retrieving revision 1.9
 diff -u -r1.9 doc.html.mk
 --- doc.html.mk	2001/10/29 09:21:53	1.9
 +++ doc.html.mk	2001/11/02 14:11:06
 @@ -68,11 +68,11 @@
  XARGS?=		/usr/bin/xargs
  
  TIDY?=		${PREFIX}/bin/tidy
 -TIDYFLAGS?=	-i -m -f /dev/null
 +TIDYOPTS?=	-i -m -f /dev/null ${TIDYFLAGS}
  HTML2TXT?=	${PREFIX}/bin/links
 -HTML2TXTFLAGS?=	-dump
 +HTML2TXTOPTS?=	-dump ${HTML2TXTFLAGS}
  HTML2PDB?=	${PREFIX}/bin/iSiloBSD
 -HTML2PDBFLAGS?=	-y -d0 -Idef
 +HTML2PDBOPTS?=	-y -d0 -Idef ${HTML2PDBFLAGS}
  
  GZIP?=	-9
  GZIP_CMD?=	gzip -qf ${GZIP}
 @@ -150,14 +150,14 @@
  ${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET}
  	${SGMLNORM} -c ${HTMLCATALOG} ${SRCS:S|^|${.CURDIR}/|} > ${.TARGET}
  .if !defined(NO_TIDY)
 -	-${TIDY} ${TIDYFLAGS} ${.TARGET}
 +	-${TIDY} ${TIDYOPTS} ${.TARGET}
  .endif
  
  ${DOC}.txt: ${DOC}.html
 -	${HTML2TXT} ${HTML2TXTFLAGS} ${.ALLSRC} > ${.TARGET}
 +	${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET}
  
  ${DOC}.pdb: ${DOC}.html ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
 -	${HTML2PDB} ${HTML2PDBFLAGS} ${DOC}.html ${.TARGET}
 +	${HTML2PDB} ${HTML2PDBOPTS} ${DOC}.html ${.TARGET}
  
  ${.CURDIR:T}.pdb: ${DOC}.pdb
  	${LN} -f ${.ALLSRC} ${.TARGET}
 Index: doc.images.mk
 ===================================================================
 RCS file: /home/ncvs/doc/share/mk/doc.images.mk,v
 retrieving revision 1.12
 diff -u -r1.12 doc.images.mk
 --- doc.images.mk	2001/10/29 09:21:53	1.12
 +++ doc.images.mk	2001/11/02 14:15:51
 @@ -96,21 +96,25 @@
  IMAGES_PDF=${IMAGES_GEN_PDF}
  
  SCR2PNG?=	${PREFIX}/bin/scr2png
 +SCR2PNGOPTS?=	${SCR2PNGFLAGS}
  EPS2PNG?=	${PREFIX}/bin/peps
 -EPS2PNGFLAGS?=	-p -r ${EPS2PNG_RES}
 +EPS2PNGOPTS?=	-p -r ${EPS2PNG_RES} ${EPS2PNGFLAGS}
  PNGTOPNM?=	${PREFIX}/bin/pngtopnm
 +PNGTOPNMOPTS?=	${PNGTOPNMFLAGS}
  PNMTOPS?=	${PREFIX}/bin/pnmtops
 -PNMTOPSFLAGS?=	-noturn
 +PNMTOPSOPTS?=	-noturn ${PNMTOPSFLAGS}
  EPSTOPDF?=	${PREFIX}/bin/epstopdf
 +EPSTOPDFOPTS?=	${EPSTOPDFFLAGS}
  
  # Use suffix rules to convert .scr files to .png files
  .SUFFIXES:	.scr .png .eps
  
  .scr.png:
 -	${SCR2PNG} < ${.IMPSRC} > ${.TARGET}
 +	${SCR2PNG} ${SCR2PNGOPTS} < ${.IMPSRC} > ${.TARGET}
  .scr.eps:
 -	${SCR2PNG} < ${.ALLSRC} | ${PNGTOPNM} | \
 -		${PNMTOPS} ${PNMTOPSFLAGS} > ${.TARGET}
 +	${SCR2PNG} ${SCR2PNGOPTS} < ${.ALLSRC} | \
 +		${PNGTOPNM} ${PNGTOPNMOPTS} | \
 +		${PNMTOPS} ${PNMTOPSOPTS} > ${.TARGET}
  
  # We can't use suffix rules to generate the rules to convert EPS to PNG and
  # PNG to EPS.  This is because a .png file can depend on a .eps file, and
 @@ -119,17 +123,19 @@
  
  .for _curimage in ${IMAGES_GEN_PNG}
  ${_curimage}: ${_curimage:S/.png$/.eps/}
 -	${EPS2PNG} ${EPS2PNGFLAGS} -o ${.TARGET} ${.ALLSRC}
 +	${EPS2PNG} ${EPS2PNGOPTS} -o ${.TARGET} ${.ALLSRC}
  .endfor
  
  .for _curimage in ${IMAGES_GEN_EPS}
  ${_curimage}: ${_curimage:S/.eps$/.png/}
 -	${PNGTOPNM} ${.ALLSRC} | ${PNMTOPS} ${PNMTOPSFLAGS} > ${.TARGET}
 +	${PNGTOPNM} ${PNGTOPNMOPTS} ${.ALLSRC} | \
 +		${PNMTOPS} ${PNMTOPSOPTS} > ${.TARGET}
  .endfor
  
  .for _curimage in ${IMAGES_GEN_PDF}
  ${_curimage}: ${_curimage:S/.pdf$/.eps/}
 -	${EPSTOPDF} --outfile=${.TARGET} ${.CURDIR}/${_curimage:S/.pdf$/.eps/}
 +	${EPSTOPDF} ${EPSTOPDFOPTS} --outfile=${.TARGET} \
 +		${.CURDIR}/${_curimage:S/.pdf$/.eps/}
  .endfor
  
  .if ${.OBJDIR} != ${.CURDIR}
 Index: doc.subdir.mk
 ===================================================================
 RCS file: /home/ncvs/doc/share/mk/doc.subdir.mk,v
 retrieving revision 1.7
 diff -u -r1.7 doc.subdir.mk
 --- doc.subdir.mk	2001/10/29 09:21:53	1.7
 +++ doc.subdir.mk	2001/11/02 13:53:03
 @@ -47,8 +47,11 @@
  #			Remove the object directory, if any.
  #
  
 +.if !target(__initialized__)
 +__initialized__:
  .if exists(${.CURDIR}/../Makefile.inc)
  .include "${.CURDIR}/../Makefile.inc"
 +.endif
  .endif
  
  .if !target(install)
 
 Cyrille.
 -- 
 Cyrille Lefevre                 mailto:clefevre@citeweb.net
State-Changed-From-To: open->closed 
State-Changed-By: murray 
State-Changed-When: Mon Nov 5 02:33:56 PST 2001 
State-Changed-Why:  
Cyrille's patch has been applied.  Thanks! 


http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31703 
>Unformatted:
