Relocate commented code to the right location

[project-aon.git] / common / epub / Makefile.common

diff --git a/common/epub/Makefile.common b/common/epub/Makefile.common
index 195f876..4f3e86e 100644 (file)
--- a/common/epub/Makefile.common
+++ b/common/epub/Makefile.common
@@ -93,8 +93,6 @@ $(AONROOTDIR)/$(BLANG)/epub/$(SERIES)/$(BASENAME)/$(EPUB): $(XMLFILE) $(EPUBSCRI
        cd $(AONROOTDIR) && perl $(EPUBSCRIPT) --language=$(BLANG) --font-files=$(FONTDIR) $(BASENAME) 
 
 $(EPUB): $(AONROOTDIR)/$(BLANG)/epub/$(SERIES)/$(BASENAME)/$(EPUB) ebook-convert
-       @[ ! -x  `which dbtoepub` ] || { echo "ERROR: Cannot find 'dbtoepub', please install this package" >&2; exit 1;  }
-       dbtoepub -o $(BOOK) $(XMLFILE) >$(BOOK).log 2>&1; \
        cp -p $(AONROOTDIR)/$(BLANG)/epub/$(SERIES)/$(BASENAME)/$(EPUB) .
 # Regenerate to include the covers properly within the Ebook and fix the EPUB
        ebook-convert $(EPUB) regen_$(EPUB) --cover $(COVERIMAGE)
@@ -106,7 +104,7 @@ $(EPUB): $(AONROOTDIR)/$(BLANG)/epub/$(SERIES)/$(BASENAME)/$(EPUB) ebook-convert
 # Calibre see http://manual.calibre-ebook.com/cli/ebook-convert.html
 
 ebook-convert:
-       @[ ! -x  `which ebook-convert` ] || { echo "ERROR: Cannot find 'ebook-convert', please install Calibre" >&2; exit 1;  }
+       @[ -x  `which ebook-convert` ] || { echo "ERROR: Cannot find 'ebook-convert', please install Calibre" >&2; exit 1;  }
 
 # Generate the mobi file from the ePub (Mobipocket format)
 mobi: $(MOBI)
@@ -143,12 +141,14 @@ mobi: $(MOBI)
 
 
 # Alternative build for the ePub format using open source tools instead
-# of our script:
+# of our script.
+# Sample Makefile code:
 #
 #DOCBOOK_XSL=/usr/share/xml/docbook/stylesheet/docbook-xsl/epub/docbook.xsl
-#$(BOOK): $(XMLFILE) $(DOCBOOK_XSL)
+#$(EPUB): $(XMLFILE) $(DOCBOOK_XSL)
+#      @[ -x  `which dbtoepub` ] || { echo "ERROR: Cannot find 'dbtoepub', please install this package" >&2; exit 1;  }
 #      if [ -x  /usr/bin/dbtoepub ] ; then  \
-#              dbtoepub -o $(BOOK) $(XMLFILE) >$(BOOK).log 2>&1; \
+#              dbtoepub -o $(EPUB) $(XMLFILE) >$(BOOK).log 2>&1; \
 #      else \
 #              xsltproc $(DOCBOOK_XSL) $< >$(BOOK).log 2>&1; \
 #              echo "application/epub+zip" > mimetype ; \