svn commit: r40893 - projects/xml-tools/share/mk

[Gabor Kovesdan]

Author: gabor
Date: Tue Feb  5 10:11:29 2013
New Revision: 40893
URL: http://svnweb.freebsd.org/changeset/doc/40893

Log:
  - Revert r40891 since the created archive has compatibility problems

Modified:
  projects/xml-tools/share/mk/doc.commands.mk
  projects/xml-tools/share/mk/doc.docbook.mk

Modified: projects/xml-tools/share/mk/doc.commands.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.commands.mk	Tue Feb  5 10:02:36 2013	(r40892)
+++ projects/xml-tools/share/mk/doc.commands.mk	Tue Feb  5 10:11:29 2013	(r40893)
@@ -46,8 +46,8 @@ BZIPOPTS?=	-qf9
 GZIP?=		gzip
 GZIPOPTS?=	-qf9
 TAR?=		/usr/bin/tar
-ZIP?=		${TAR}
-ZIPOPTS?=	-c --format=zip --options zip:compression=deflate -f
+ZIP?=		${PREFIX}/bin/zip
+ZIPOPTS?=	-9X
 
 #
 # Rendering and format conversion

Modified: projects/xml-tools/share/mk/doc.docbook.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.docbook.mk	Tue Feb  5 10:02:36 2013	(r40892)
+++ projects/xml-tools/share/mk/doc.docbook.mk	Tue Feb  5 10:11:29 2013	(r40893)
@@ -364,7 +364,8 @@ ${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_I
 .if defined(LOCAL_IMAGES_LIB) || defined(LOCAL_IMAGES_PNG)
 	${CP} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} OEBPS/
 .endif
-	${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype OEBPS META-INF
+	${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype
+	${ZIP} ${ZIPOPTS} -Dr ${DOC}.epub OEBPS META-INF
 
 # TXT --------------------------------------------------------------------