3 files changed, 8 insertions, 6 deletions
diff --git a/backend/Makefile.am b/backend/Makefile.am
index 1c042067..49bfdf6a 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -6,6 +6,10 @@ if ENABLE_PDF
 SUBDIRS += pdf
 endif
 
+if ENABLE_EPUB
+SUBDIRS += epub
+endif
+
 if ENABLE_PS 
 SUBDIRS += ps
 endif
@@ -34,10 +38,6 @@ if ENABLE_XPS
 SUBDIRS += xps
 endif
 
-if ENABLE_EPUB
- SUBDIRS += epub
-endif
-
 EXTRA_DIST = \
 backend.symbols
 
diff --git a/backend/epub/Makefile.am b/backend/epub/Makefile.am
index a40f5ff1..31dd455e 100644
--- a/backend/epub/Makefile.am
+++ b/backend/epub/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = minizip
+
 AM_CPPFLAGS = \
 -I$(top_srcdir) \
 -I$(top_srcdir)/libdocument \
diff --git a/backend/epub/epub-document.h b/backend/epub/epub-document.h
index db9c99e5..c9fd760d 100644
--- a/backend/epub/epub-document.h
+++ b/backend/epub/epub-document.h
@@ -6,10 +6,10 @@
 G_BEGIN_DECLS
 
 #define EPUB_TYPE_DOCUMENT (epub_document_get_type ())
-#define EPUB_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPUB_TYPE_DOCUMENT, ePubDocument))
+#define EPUB_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPUB_TYPE_DOCUMENT, EpubDocument))
 #define EPUB_IS_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPUB_TYPE_DOCUMENT))
 
-typedef struct _ePubDocument ePubDocument;
+typedef struct _EpubDocument EpubDocument;
 
 GType epub_document_get_type (void) G_GNUC_CONST;