From owner-freebsd-doc@FreeBSD.ORG  Mon Jan 16 21:38:46 2012
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: freebsd-doc@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 34CFB106566B
	for <freebsd-doc@FreeBSD.org>; Mon, 16 Jan 2012 21:38:46 +0000 (UTC)
	(envelope-from uqs@spoerlein.net)
Received: from acme.spoerlein.net (acme.spoerlein.net
	[IPv6:2a01:4f8:131:23c2::1])
	by mx1.freebsd.org (Postfix) with ESMTP id C09EF8FC1B
	for <freebsd-doc@FreeBSD.org>; Mon, 16 Jan 2012 21:38:45 +0000 (UTC)
Received: from localhost (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1])
	by acme.spoerlein.net (8.14.5/8.14.4) with ESMTP id q0GLcinS070914
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO)
	for <freebsd-doc@FreeBSD.org>; Mon, 16 Jan 2012 22:38:44 +0100 (CET)
	(envelope-from uqs@spoerlein.net)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=spoerlein.net;
	s=dkim200908; t=1326749925;
	bh=KqfFOQ/uiMG/LiCW85I0tthgrrBoPnG6vGMvRy2cOj4=;
	h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type;
	b=TN3mF+HTeoS4MHUogheRei2YA3zZAFjszsl1bTeL6hyEWxZLmAuE0hNrG0ZorzdWf
	rKdeykYR7CXEd3KeU+tgBK5oa8B5Ly1dVRzoiQ3BVnfvzgQuIUcty/+Y//IrGcNJjP
	+QW0spKbcYSxjGJWOUecSxacSjWV8KyANQU2iKvs=
Date: Mon, 16 Jan 2012 22:38:44 +0100
From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@spoerlein.net>
To: freebsd-doc@FreeBSD.org
Message-ID: <20120116213844.GY3489@acme.spoerlein.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="hwvH6HDNit2nSK4j"
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: 
Subject: doc build with .OBJDIR
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jan 2012 21:38:46 -0000


--hwvH6HDNit2nSK4j
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hey,

erm, I must be doing something rather stupid, as a handbook build will
fail to succeed if I run 'make obj' first.

The attached patch fixes that for me and also still works for non-OBJDIR
builds.

Ok to commit?

Cheers,
Uli

--hwvH6HDNit2nSK4j
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="docimages.diff"

Index: share/mk/doc.images.mk
===================================================================
RCS file: /home/dcvs/doc/share/mk/doc.images.mk,v
retrieving revision 1.31
diff -u -p -r1.31 doc.images.mk
--- share/mk/doc.images.mk	25 Dec 2009 18:12:00 -0000	1.31
+++ share/mk/doc.images.mk	16 Jan 2012 21:21:01 -0000
@@ -91,29 +91,10 @@ IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_
 IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS}
 IMAGES_TXT= ${_IMAGES_TXT} ${IMAGES_SCR_TXT}
 
-.if ${.OBJDIR} != ${.CURDIR}
-LOCAL_IMAGES= ${IMAGES:S|^|${.OBJDIR}/|}
-CLEANFILES+= ${LOCAL_IMAGES}
-
-.if !empty(_IMAGES_PNG)
-LOCAL_IMAGES_PNG= ${_IMAGES_PNG:S|^|${.OBJDIR}/|}
-.endif
-
-.if !empty(_IMAGES_EPS)
-LOCAL_IMAGES_EPS= ${_IMAGES_EPS:S|^|${.OBJDIR}/|}
-.endif
-
-.if !empty(_IMAGES_TXT)
-LOCAL_IMAGES_TXT= ${_IMAGES_TXT:S|^|${.OBJDIR}/|}
-.endif
-
-.else
 LOCAL_IMAGES= ${IMAGES}
 LOCAL_IMAGES_PNG= ${_IMAGES_PNG}
 LOCAL_IMAGES_EPS= ${_IMAGES_EPS}
 LOCAL_IMAGES_TXT= ${_IMAGES_TXT}
-.endif
-
 LOCAL_IMAGES_PNG+= ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG}
 LOCAL_IMAGES_EPS+= ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS}
 LOCAL_IMAGES_TXT+= ${IMAGES_SCR_TXT}

--hwvH6HDNit2nSK4j--