svn commit: r48776 - head/share/mk

[Warren Block]

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