gnucash-docs master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/a50f8722 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/1c919e80 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/f6ec7f08 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/36b27d0a (commit)



commit a50f8722914399108318d6e015d3207a06b38f70
Merge: 36b27d0 1c919e8
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jan 1 13:28:32 2019 -0800

    Merge branch 'maint'


commit 1c919e800a3d7c5b542604d437fb4ea6d8ecf3c9
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jan 1 13:26:10 2019 -0800

    Rearrange the epub posthook script.
    
    So that  points to the right directory.

diff --git a/epub.make b/epub.make
index bef047a..aec5aea 100644
--- a/epub.make
+++ b/epub.make
@@ -11,14 +11,15 @@ epub-am:
 .xml.epub:
 	EPUB_TMPDIR=`mktemp -d .epubtmpXXXXXXXX`; \
 	posthook='exit 1'; \
-	(cd "$$EPUB_TMPDIR" && \
-	echo "application/epub+zip" > mimetype && \
+	( echo "application/epub+zip" > mimetype && \
 	$(XSLTPROC) $(XSLTPROCFLAGS) \
+	            -o $$EPUB_TMPDIR/ \
 	            --stringparam base.dir OEBPS/ \
 	            --stringparam epub.metainf.dir META-INF/ \
 	            --stringparam epub.oebps.dir OEBPS/ \
 	            $(abs_top_srcdir)/xsl/1.79.2/epub/docbook.xsl \
 	            $(abs_srcdir)/$(docname).xml && \
+	cd "$$EPUB_TMPDIR" && \
 	cp -L -R $(abs_srcdir)/figures OEBPS/ && \
 	zip -X -r ../$(epubfile) mimetype META-INF OEBPS && \
 	cd ..) && posthook=''; \

commit f6ec7f08a81934fab7e5a3dee4c1ee23d7d7b8ab
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Dec 31 22:20:34 2018 -0800

    Bug 796998 - Expansion of <application>&app;</application> broken
    
    xsltproc needs the path to gnc-docbookx.dtd too.

diff --git a/configure.ac b/configure.ac
index 6c757be..78d2bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_PATH_PROG(XSLTPROC, xsltproc)
 if test -z "$XSLTPROC"; then
   AC_MSG_ERROR([xsltproc not found, perhaps you should install the xsltproc or libxslt package ?])
 fi
-XSLTPROCFLAGS="--xinclude $XSLTPROCFLAGS"
+XSLTPROCFLAGS="--path \${top_srcdir}/docbook --xinclude $XSLTPROCFLAGS"
 AC_SUBST([XSLTPROCFLAGS])
 
 dnl Same for xmllint



Summary of changes:
 configure.ac | 2 +-
 epub.make    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)