From: Javier Fernández-Sanguino <javier.fernandez-sanguino@projectaon.org>
Date: Tue, 9 May 2017 23:50:12 +0000 (+0000)
Subject: Relocate commented code to the right location
X-Git-Tag: 20180215~81
X-Git-Url: http://git.projectaon.org/?p=project-aon.git;a=commitdiff_plain;h=21291e79cf4e2ef8abf1dd35f3a32c8d87c087cc;hp=4d9822ef9cef99fd823fd5ba7cd1e17bc3561664

Relocate commented code to the right location

git-svn-id: https://projectaon.org/data/trunk@2617 f6f3e2d7-ff33-0410-aaf5-b4bee2cdac11
---

diff --git a/common/epub/Makefile.common b/common/epub/Makefile.common
index 43fc645..4f3e86e 100644
--- a/common/epub/Makefile.common
+++ b/common/epub/Makefile.common
@@ -91,9 +91,6 @@ XSLFILES=$(RELXSLDIR)/epub-opf-metadata.xsl $(RELXSLDIR)/epub-xhtml.xsl  \
 epub: $(EPUB)
 $(AONROOTDIR)/$(BLANG)/epub/$(SERIES)/$(BASENAME)/$(EPUB): $(XMLFILE) $(EPUBSCRIPT) $(XSLFILES)
 	cd $(AONROOTDIR) && perl $(EPUBSCRIPT) --language=$(BLANG) --font-files=$(FONTDIR) $(BASENAME) 
-# Alternate generation mechanism
-#	@[ -x  `which dbtoepub` ] || { echo "ERROR: Cannot find 'dbtoepub', please install this package" >&2; exit 1;  }
-#	dbtoepub -o $(BOOK) $(XMLFILE) >$(BOOK).log 2>&1; \
 
 $(EPUB): $(AONROOTDIR)/$(BLANG)/epub/$(SERIES)/$(BASENAME)/$(EPUB) ebook-convert
 	cp -p $(AONROOTDIR)/$(BLANG)/epub/$(SERIES)/$(BASENAME)/$(EPUB) .
@@ -144,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 ; \