From owner-p4-releng  Tue Apr  2 13:53:57 2002
Delivered-To: p4-releng@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E72D37B419; Tue,  2 Apr 2002 13:53:50 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 423B137B422
	for <perforce@freebsd.org>; Tue,  2 Apr 2002 13:53:49 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g32LrnQ29689
	for perforce@freebsd.org; Tue, 2 Apr 2002 13:53:49 -0800 (PST)
	(envelope-from bmah@freebsd.org)
Date: Tue, 2 Apr 2002 13:53:49 -0800 (PST)
Message-Id: <200204022153.g32LrnQ29689@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmah@freebsd.org using -f
From: "Bruce A. Mah" <bmah@FreeBSD.org>
Subject: PERFORCE change 8929 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-releng@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-releng.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-releng>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-releng>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8929

Change 8929 by bmah@bmah_intruder on 2002/04/02 13:52:50

	Don't make the assumption that source files are writable.
	The FDP infrastructure has a few constructs of the form
	"cp foo bar; cat baz >> bar".  This breaks if foo isn't
	writable (as is frequently the case in P4 work directory).
	
	I'm not sure if this change should be made in CVS or not,
	and if so, if this is exactly the right change.  In the meantime,
	we've at least unbroken doc builds out of P4 work areas.

Affected files ...

... //depot/releng/5_dp1/doc/share/mk/doc.docbook.mk#2 edit

Differences ...

==== //depot/releng/5_dp1/doc/share/mk/doc.docbook.mk#2 (text+ko) ====

@@ -413,7 +413,8 @@
 	${LN} -f ${.ALLSRC} ${.TARGET}
 
 ${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${INDEX_SGML} ${PRINT_INDEX}
-	${CP} -p ${PDFTEX_DEF} ${.TARGET}
+	${RM} -f ${.TARGET}
+	${CAT} ${PDFTEX_DEF} > ${.TARGET}
 	${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
 		${JADEOPTS} -t tex -o /dev/stdout ${MASTERDOC} >> ${.TARGET}
 
@@ -726,7 +727,8 @@
 
 .if ${LOCAL_CSS_SHEET} != ${CSS_SHEET}
 ${LOCAL_CSS_SHEET}: ${CSS_SHEET}
-	${CP} -p ${.ALLSRC} ${.TARGET}
+	${RM} -f ${.TARGET}
+	${CAT} ${.ALLSRC} > ${.TARGET}
 .if defined(CSS_SHEET_ADDITIONS)
 	${CAT} ${.CURDIR}/${CSS_SHEET_ADDITIONS} >> ${.TARGET}
 .endif

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-releng" in the body of the message