Patchwork [v3] doc-epub

login
register
mail settings
Submitter Benjamin Kosnik
Date Sept. 21, 2011, 11:53 p.m.
Message ID <20110921165303.1d457206@shotwell>
Download mbox | patch
Permalink /patch/115872/
State New
Headers show

Comments

Benjamin Kosnik - Sept. 21, 2011, 11:53 p.m.
Fix for image directory location. The generated epub is ok, but missing
images. There's another tool that may be used to generate epubs, called
db2epub.py, but it isn't cooperating. So we will stick with the status
quo for now.

-benjamin

Patch

2011-09-21  Benjamin Kosnik  <bkoz@redhat.com

	* doc/Makefile.am (stamp-epub-docbook): Fix image directory location.
	* doc/Makefile.in: Regenerate.


diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am
index 71b6e69..1e38682 100644
--- a/libstdc++-v3/doc/Makefile.am
+++ b/libstdc++-v3/doc/Makefile.am
@@ -396,7 +396,7 @@  xml_image_basic = \
 	${xml_image_dir}/pbds_tree_node_invariants.png \
 	${xml_image_dir}/pbds_tree_node_updator_policy_cd.png \
 	${xml_image_dir}/pbds_trie_node_updator_policy_cd.png \
-	${xml_image_dir}/pbds_update_seq_diagram.png 
+	${xml_image_dir}/pbds_update_seq_diagram.png
 
 xml_image_generated = \
 	${xml_image_dir}/pbds_binary_priority_queue_int_push_pop.png \
@@ -488,7 +488,6 @@  ${docbook_outdir}/texinfo:
 
 ${docbook_outdir}/xml:
 	mkdir -p ${docbook_outdir}/xml
-	mkdir -p ${docbook_outdir}/xml/images
 
 # Validate existing XML structure.
 XMLLINT = xmllint
@@ -512,9 +511,6 @@  stamp-xml-single-docbook: $(xml_sources) ${docbook_outdir}/xml
 	${top_srcdir}/doc/xml/manual/spine.xml > ${manual_xml};
 	$(XMLLINT) $(XMLLINT_FLAGS) \
 	${top_srcdir}/doc/xml/spine.xml > ${set_xml};
-	if [ ! -d "${docbook_outdir}/xml/images" ]; then \
-	  $(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/xml/; \
-	fi
 	$(STAMP) stamp-xml-single-docbook
 
 doc-xml-single-docbook: stamp-xml-single-docbook
@@ -595,10 +591,14 @@  doc-texinfo-docbook: stamp-texinfo-docbook
 
 doc-info-docbook: stamp-info-docbook
 
-# EPUB, via dbtoepub + ruby
+# EPUB, via ruby + dbtoepub
+# Can verify document with: epubcheck
 manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub
 stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub
 	@echo "Generating epub files..."
+	if [ ! -d "${docbook_outdir}/images" ]; then \
+	  $(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/; \
+	fi
 	${XSL_STYLE_DIR}/epub/bin/dbtoepub -v -d -o ${manual_epub} ${set_xml}
 	$(STAMP) stamp-epub-docbook