From owner-svn-doc-all@freebsd.org  Wed May  4 21:35:13 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61C7DB2DC8B;
 Wed,  4 May 2016 21:35:13 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3206A11E3;
 Wed,  4 May 2016 21:35:13 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u44LZCap036387;
 Wed, 4 May 2016 21:35:12 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u44LZCL2036386;
 Wed, 4 May 2016 21:35:12 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201605042135.u44LZCL2036386@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 4 May 2016 21:35:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48776 - head/share/mk
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2016 21:35:13 -0000

Author: wblock
Date: Wed May  4 21:35:12 2016
New Revision: 48776
URL: https://svnweb.freebsd.org/changeset/doc/48776

Log:
  Generate the correct paths to images in epub documents.

Modified:
  head/share/mk/doc.docbook.mk

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Tue May  3 18:27:25 2016	(r48775)
+++ head/share/mk/doc.docbook.mk	Wed May  4 21:35:12 2016	(r48776)
@@ -371,9 +371,16 @@ ${DOC}.html.tar: ${DOC}.html ${LOCAL_IMA
 ${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
 	${CSS_SHEET} ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.parsed.xml
-.if defined(LOCAL_IMAGES_LIB) || defined(LOCAL_IMAGES_PNG)
-.for f in ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
-	${CP} ${f} OEBPS/
+.if defined(LOCAL_IMAGES_LIB)
+.for f in ${LOCAL_IMAGES_LIB}
+	[ -d "OEBPS/${f:H}" ] || ${MKDIR} -pv "OEBPS/${f:H}"
+	${CP} ${f} OEBPS/${f}
+.endfor
+.endif
+.if defined(LOCAL_IMAGES_PNG)
+.for f in ${LOCAL_IMAGES_PNG}
+	[ -d "OEBPS/${f:H:T}" ] || ${MKDIR} -pv "OEBPS/${f:H:T}"
+	${CP} -v ${f} OEBPS/${f:H:T}/${f:T}
 .endfor
 .endif
 	${ZIP} ${ZIPOPTS} -r -X ${DOC}.epub mimetype OEBPS META-INF