From owner-freebsd-doc  Mon Feb  4 10:29:48 2002
Delivered-To: freebsd-doc@freebsd.org
Received: from mailman.packetdesign.com (dns.packetdesign.com [65.192.41.10])
	by hub.freebsd.org (Postfix) with ESMTP
	id 31D4137B41F; Mon,  4 Feb 2002 10:29:28 -0800 (PST)
Received: from nimitz.packetdesign.com (nimitz.packetdesign.com [192.168.0.184])
	by mailman.packetdesign.com (8.11.0/8.11.0) with ESMTP id g14ITSp40105;
	Mon, 4 Feb 2002 10:29:28 -0800 (PST)
	(envelope-from bmah@packetdesign.com)
Received: (from bmah@localhost)
	by nimitz.packetdesign.com (8.11.6/8.11.6) id g14ITSE62544;
	Mon, 4 Feb 2002 10:29:28 -0800 (PST)
	(envelope-from bmah)
Message-Id: <200202041829.g14ITSE62544@nimitz.packetdesign.com>
X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4
To: murray@freebsd.org
Cc: bmah@freebsd.org, freebsd-doc@freebsd.org
Subject: PDF generation wart, patch for same
From: bmah@freebsd.org (Bruce A. Mah)
Reply-To: bmah@freebsd.org
X-Face: g~c`.{#4q0"(V*b#g[i~rXgm*w;:nMfz%_RZLma)UgGN&=j`5vXoU^@n5<Pi&akO)o^8;[r
 %l(8ZHlbF`dD>v4:OO)c["!w)nD/!!~e4Sj7LiT'6*wZ83454H""lb{CC%T37O!!'S$S&D}sem7I[A
 2V%N&+
X-Image-Url: http://www.employees.org/~bmah/Images/bmah-cisco-small.gif
X-Url: http://www.employees.org/~bmah/
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Mon, 04 Feb 2002 10:29:28 -0800
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-doc.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%20freebsd-doc>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-doc>
X-Loop: FreeBSD.org

The latest change to doc.images.mk broke PDF generation for the releng 
article because the PDF images aren't listed as dependencies for the 
*.tex-pdf file.  Consequently, texpdf complains because it can't find 
the images.

I think the following patch fixes this, and also fixes a problem where
"make FORMATS=pdf clean" wouldn't get rid of a *.ps intermediate file.
This is an extremely ugly hack, and I'm almost ashamed to have my name 
on it.

Whatcha think?

Bruce.

PS.  Editorial comment to whomever is reading:  IMAGES_GEN_* are now
misleading, now that image files can come from multiple source formats.

Index: doc.images.mk
===================================================================
RCS file: /home/ncvs/doc/share/mk/doc.images.mk,v
retrieving revision 1.15
diff -u -r1.15 doc.images.mk
--- doc.images.mk	2 Feb 2002 20:30:55 -0000	1.15
+++ doc.images.mk	4 Feb 2002 18:23:13 -0000
@@ -57,12 +57,15 @@
 IMAGES_GEN_PDF= ${_IMAGES_EPS:S/.eps$/.pdf/}
 IMAGES_SCR_PNG= ${_IMAGES_SCR:S/.scr$/.png/}
 IMAGES_SCR_EPS= ${_IMAGES_SCR:S/.scr$/.eps/}
+IMAGES_SCR_PDF= ${_IMAGES_SCR:S/.scr$/.pdf/}
 IMAGES_PIC_PNG= ${_IMAGES_PIC:S/.pic$/.png/}
 IMAGES_PIC_EPS= ${_IMAGES_PIC:S/.pic$/.eps/}
+IMAGES_PIC_PDF= ${_IMAGES_PIC:S/.pic$/.pdf/}
+IMAGES_GEN_PDF+= ${IMAGES_PIC_PDF} ${IMAGES_SCR_PDF}
 
 CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS} ${IMAGES_GEN_PDF}
 CLEANFILES+= ${IMAGES_SCR_PNG} ${IMAGES_SCR_EPS}
-CLEANFILES+= ${IMAGES_PIC_PNG} ${IMAGES_PIC_EPS}
+CLEANFILES+= ${IMAGES_PIC_PNG} ${IMAGES_PIC_EPS} ${_IMAGES_PIC:S/.pic$/.ps/}
 
 IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG}
 IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS}



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