From owner-freebsd-doc Mon Oct 8 21: 0:22 2001 Delivered-To: freebsd-doc@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7D63837B403 for ; Mon, 8 Oct 2001 21:00:04 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f99404A60648; Mon, 8 Oct 2001 21:00:04 -0700 (PDT) (envelope-from gnats) Date: Mon, 8 Oct 2001 21:00:04 -0700 (PDT) Message-Id: <200110090400.f99404A60648@freefall.freebsd.org> To: freebsd-doc@freebsd.org Cc: From: Cyrille Lefevre Subject: Re: docs/31131: build/install doc isn't /usr/obj prefix clean Reply-To: Cyrille Lefevre Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR docs/31131; it has been noted by GNATS. From: Cyrille Lefevre To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: docs/31131: build/install doc isn't /usr/obj prefix clean Date: Tue, 9 Oct 2001 05:54:22 +0200 (CEST) well, when I tested this patch, the FORMATS variable contains only a subset of the KNOWN_FORMATS varaible. so, I made some new corrections to the doc Makefiles to be more objdir clean than ever. here is a complement to the previous patch set. PS : I have to make a new test using INSTALL_COMPRESSED=gz since I default it to nothing, but since this take a very long time on my computer (I've only a P166), I'll post more corrections later if any. Common subdirectories: /tmp/doc/share/mk/CVS and doc/share/mk/CVS diff -u /tmp/doc/share/mk/doc.docbook.mk doc/share/mk/doc.docbook.mk --- /tmp/doc/share/mk/doc.docbook.mk Tue Oct 9 05:41:17 2001 +++ doc/share/mk/doc.docbook.mk Tue Oct 9 05:35:32 2001 @@ -323,6 +323,7 @@ CLEANFILES+= ${HTML_SPLIT_INDEX} ${HTML_INDEX} ${PRINT_INDEX} .endif +LOCAL_IMAGES_LIB ?= .for _curimage in ${IMAGES_LIB} LOCAL_IMAGES_LIB += ${LOCAL_IMAGES_LIB_DIR}/${_curimage} .endfor @@ -359,14 +360,22 @@ ${DOC}.html-split.tar: HTML.manifest ${TAR} cf ${.TARGET} $$(${XARGS} < HTML.manifest) +.if !empty(IMAGES_LIB) ${TAR} uf ${.TARGET} ${IMAGES_LIB} +.endif +.if !empty(IMAGES_PNG) ${TAR} uf ${.TARGET} ${IMAGES_PNG} +.endif ${TAR} uf ${.TARGET} docbook.css ${DOC}.html.tar: ${DOC}.html ${TAR} cf ${.TARGET} ${DOC}.html +.if !empty(LOCAL_IMAGES_LIB) ${TAR} uf ${.TARGET} ${LOCAL_IMAGES_LIB} +.endif +.if !empty(IMAGES_PNG) ${TAR} uf ${.TARGET} ${IMAGES_PNG} +.endif ${TAR} uf ${.TARGET} docbook.css ${DOC}.txt: ${DOC}.html-text @@ -376,7 +385,7 @@ ${HTML2PDB} ${HTML2PDBFLAGS} ${.ALLSRC} ${.TARGET} ${.CURDIR:T}.pdb: ${DOC}.pdb - ${LN} -f ${DOC}.pdb ${.CURDIR}.pdb + ${LN} -f ${DOC}.pdb ${.CURDIR:T}.pdb ${DOC}.rtf: ${SRCS} ${JADE} -V rtf-backend ${PRINTOPTS} ${JADEOPTS} \ @@ -418,7 +427,7 @@ ${DVIPS} -o ${.TARGET} ${.ALLSRC} ${DOC}.tar: ${SRCS} - ${TAR} cf ${.TARGET} ${.ALLSRC} + ${TAR} cf ${.TARGET} -C ${.CURDIR} ${.ALLSRC:S|${.CURDIR}/||} # ------------------------------------------------------------------------ # diff -u /tmp/doc/share/mk/doc.html.mk doc/share/mk/doc.html.mk --- /tmp/doc/share/mk/doc.html.mk Tue Oct 9 05:41:17 2001 +++ doc/share/mk/doc.html.mk Tue Oct 9 05:34:35 2001 @@ -145,10 +145,10 @@ ${HTML2PDB} ${HTML2PDBFLAGS} ${.ALLSRC} ${.TARGET} ${.CURDIR:T}.pdb: ${DOC}.pdb - ${LN} -f ${DOC}.pdb ${.CURDIR}.pdb + ${LN} -f ${DOC}.pdb ${.CURDIR:T}.pdb ${DOC}.tar: ${SRCS} - ${TAR} cf ${.TARGET} ${.ALLSRC} + ${TAR} cf ${.TARGET} -C ${.CURDIR} ${.ALLSRC:S|${.CURDIR}/||} # # Build targets for any formats we've missed that we don't handle. diff -u /tmp/doc/share/mk/doc.images.mk doc/share/mk/doc.images.mk --- /tmp/doc/share/mk/doc.images.mk Tue Oct 9 05:41:17 2001 +++ doc/share/mk/doc.images.mk Tue Oct 9 05:38:15 2001 @@ -73,7 +73,7 @@ PNGTOPNM?= ${PREFIX}/bin/pngtopnm PNMTOPS?= ${PREFIX}/bin/pnmtops PNMTOPSFLAGS?= -noturn -EPS2PDF?= ${PREFIX}/bin/epstopdf +EPSTOPDF?= ${PREFIX}/bin/epstopdf # Use suffix rules to convert .scr files to .png files .SUFFIXES: .scr .png .eps Cyrille. -- Cyrille Lefevre mailto:clefevre@citeweb.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message