Patchwork [v3] docbook vs. images

login
register
mail settings
Submitter Benjamin Kosnik
Date Aug. 4, 2011, 11:20 p.m.
Message ID <20110804162019.2a0e4267@shotwell>
Download mbox | patch
Permalink /patch/108586/
State New
Headers show

Comments

Benjamin Kosnik - Aug. 4, 2011, 11:20 p.m.
This fixes the docbook html output with respect to images. Now,
filerefs for PNG data are relative to the html install directory, and an
images directory is copied and populated so that the links match PNG
files.

tested x86/linux

-benjamin

Patch

2011-08-04  Benjamin Kosnik  <bkoz@redhat.com>

	* doc/xml/manual/build_hacking.xml: Use relative fileref for PNG
	imagedata.
	* doc/xml/manual/test_policy_data_structures.xml: Same.
	* doc/xml/manual/policy_data_structures.xml: Same.

	* doc/Makefile.am (stamp-html-docbook-images)
	(stamp-html-docbook-lwg, stamp-html-docbook-data): New.
	(xml_extra): Add lwg html file dependencies.
	(xml_images): Add image html file dependencies.
	* doc/Makefile.in: Regenerate.
	(stamp-html): Change to stamp-html-docbook-data.
	(stamp-html-copy): Remove.

Index: doc/xml/manual/build_hacking.xml
===================================================================
--- doc/xml/manual/build_hacking.xml	(revision 177416)
+++ doc/xml/manual/build_hacking.xml	(working copy)
@@ -45,10 +45,10 @@ 
     <title>Configure and Build File Dependencies</title>
   <mediaobject>
     <imageobject>
-      <imagedata align="center" format="PDF" scale="75" fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/confdeps.pdf"/>
+      <imagedata align="center" format="PDF" scale="75" fileref="../images/confdeps.pdf"/>
     </imageobject>
     <imageobject>
-      <imagedata align="center" format="PNG" scale="100" fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/confdeps.png"/>
+      <imagedata align="center" format="PNG" scale="100" fileref="../images/confdeps.png"/>
     </imageobject>
     <textobject>
       <phrase>Dependency Graph for Configure and Build Files</phrase>
Index: doc/xml/manual/test_policy_data_structures.xml
===================================================================
--- doc/xml/manual/test_policy_data_structures.xml	(revision 177416)
+++ doc/xml/manual/test_policy_data_structures.xml	(working copy)
@@ -106,7 +106,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_text_find_timing_test_hash_local.png"/>
+			   fileref="../images/pbds_text_find_timing_test_hash_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -433,7 +433,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_cc_hash_random_int_find_timing_test_local.png"/>
+			   fileref="../images/pbds_cc_hash_random_int_find_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -694,7 +694,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_gp_hash_random_int_find_timing_test_local.png"/>
+			   fileref="../images/pbds_gp_hash_random_int_find_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -953,7 +953,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_cc_hash_random_int_subscript_timing_test_find_local.png"/>
+			   fileref="../images/pbds_cc_hash_random_int_subscript_timing_test_find_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -1212,7 +1212,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_gp_hash_random_int_subscript_timing_test_find_local.png"/>
+			   fileref="../images/pbds_gp_hash_random_int_subscript_timing_test_find_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -1452,7 +1452,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_cc_hash_random_int_subscript_timing_test_insert_local.png"/>
+			   fileref="../images/pbds_cc_hash_random_int_subscript_timing_test_insert_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -1711,7 +1711,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_gp_hash_random_int_subscript_timing_test_insert_local.png"/>
+			   fileref="../images/pbds_gp_hash_random_int_subscript_timing_test_insert_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -1983,7 +1983,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_hash_zlob_random_int_find_timing_test_local.png"/>
+			   fileref="../images/pbds_hash_zlob_random_int_find_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -2282,7 +2282,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_hash_random_int_erase_mem_usage_test_local.png"/>
+			   fileref="../images/pbds_hash_random_int_erase_mem_usage_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -2568,7 +2568,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_tree_text_insert_timing_test_node_tree_local.png"/>
+			   fileref="../images/pbds_tree_text_insert_timing_test_node_tree_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 
@@ -2687,7 +2687,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_tree_text_insert_timing_test_vector_tree_local.png"/>
+			   fileref="../images/pbds_tree_text_insert_timing_test_vector_tree_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -2779,7 +2779,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_tree_text_insert_timing_test_pat_trie_local.png"/>
+			   fileref="../images/pbds_tree_text_insert_timing_test_pat_trie_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -2941,7 +2941,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_text_find_timing_test_tree_like_local.png"/>
+			   fileref="../images/pbds_text_find_timing_test_tree_like_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -3213,7 +3213,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_tree_text_lor_find_timing_test_local.png"/>
+			   fileref="../images/pbds_tree_text_lor_find_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -3456,7 +3456,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_tree_split_join_timing_test_local.png"/>
+			   fileref="../images/pbds_tree_split_join_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -3716,7 +3716,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_tree_order_statistics_timing_test_local.png"/>
+			   fileref="../images/pbds_tree_order_statistics_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -3909,7 +3909,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_find_timing_test_small_s2p_tree_local.png"/>
+			   fileref="../images/pbds_multimap_text_find_timing_test_small_s2p_tree_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -4095,7 +4095,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_find_timing_test_small_s2p_hash_local.png"/>
+			   fileref="../images/pbds_multimap_text_find_timing_test_small_s2p_hash_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -4374,7 +4374,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_find_timing_test_large_s2p_tree_local.png"/>
+			   fileref="../images/pbds_multimap_text_find_timing_test_large_s2p_tree_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -4560,7 +4560,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_find_timing_test_large_s2p_hash_local.png"/>
+			   fileref="../images/pbds_multimap_text_find_timing_test_large_s2p_hash_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -4843,7 +4843,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_insert_timing_test_small_s2p_tree_local.png"/>
+			   fileref="../images/pbds_multimap_text_insert_timing_test_small_s2p_tree_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -5029,7 +5029,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_find_timing_test_small_s2p_hash_local.png"/>
+			   fileref="../images/pbds_multimap_text_find_timing_test_small_s2p_hash_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -5312,7 +5312,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_insert_timing_test_large_s2p_tree_local.png"/>
+			   fileref="../images/pbds_multimap_text_insert_timing_test_large_s2p_tree_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -5498,7 +5498,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_find_timing_test_large_s2p_hash_local.png"/>
+			   fileref="../images/pbds_multimap_text_find_timing_test_large_s2p_hash_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -5775,7 +5775,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_insert_mem_usage_test_small_s2p_tree_local.png"/>
+			   fileref="../images/pbds_multimap_text_insert_mem_usage_test_small_s2p_tree_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -5961,7 +5961,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_find_timing_test_large_s2p_hash_local.png"/>
+			   fileref="../images/pbds_multimap_text_find_timing_test_large_s2p_hash_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -6237,7 +6237,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_insert_mem_usage_test_large_s2p_tree_local.png"/>
+			   fileref="../images/pbds_multimap_text_insert_mem_usage_test_large_s2p_tree_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -6423,7 +6423,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_multimap_text_find_timing_test_large_s2p_hash_local.png"/>
+			   fileref="../images/pbds_multimap_text_find_timing_test_large_s2p_hash_local.png"/>
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PDF" scale="33"
@@ -6710,7 +6710,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_priority_queue_text_push_timing_test_local.png"/>
+			   fileref="../images/pbds_priority_queue_text_push_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -6898,7 +6898,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml//images/pbds_pairing_priority_queue_text_push_timing_test_local.png"/>
+			   fileref="../images/pbds_pairing_priority_queue_text_push_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -7097,7 +7097,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_priority_queue_text_push_pop_timing_test_local.png"/>
+			   fileref="../images/pbds_priority_queue_text_push_pop_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -7285,7 +7285,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml//images/pbds_pairing_priority_queue_text_push_pop_timing_test_local.png"/>
+			   fileref="../images/pbds_pairing_priority_queue_text_push_pop_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -7464,7 +7464,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_priority_queue_random_int_push_timing_test_local.png"/>
+			   fileref="../images/pbds_priority_queue_random_int_push_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -7652,7 +7652,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml//images/pbds_binary_priority_queue_random_int_push_timing_test_local.png"/>
+			   fileref="../images/pbds_binary_priority_queue_random_int_push_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -7816,7 +7816,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_priority_queue_random_int_push_pop_timing_test_local.png"/>
+			   fileref="../images/pbds_priority_queue_random_int_push_pop_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -8081,7 +8081,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_priority_queue_text_pop_mem_usage_test_local.png"/>
+			   fileref="../images/pbds_priority_queue_text_pop_mem_usage_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -8333,7 +8333,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_priority_queue_text_join_timing_test_local.png"/>
+			   fileref="../images/pbds_priority_queue_text_join_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -8592,7 +8592,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_priority_queue_text_modify_up_timing_test_local.png"/>
+			   fileref="../images/pbds_priority_queue_text_modify_up_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -8780,7 +8780,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml//images/pbds_priority_queue_text_modify_up_timing_test_pairing_thin_local.png"/>
+			   fileref="../images/pbds_priority_queue_text_modify_up_timing_test_pairing_thin_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -8954,7 +8954,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_priority_queue_text_modify_down_timing_test_local.png"/>
+			   fileref="../images/pbds_priority_queue_text_modify_down_timing_test_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
@@ -9142,7 +9142,7 @@ 
 	      </imageobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml//images/pbds_priority_queue_text_modify_down_timing_test_pairing_thin_local.png"/>
+			   fileref="../images/pbds_priority_queue_text_modify_down_timing_test_pairing_thin_local.png"/>
 	      </imageobject>
 	    </mediaobject>
 	  </informalfigure>
Index: doc/xml/manual/policy_data_structures.xml
===================================================================
--- doc/xml/manual/policy_data_structures.xml	(revision 177416)
+++ doc/xml/manual/policy_data_structures.xml	(working copy)
@@ -304,7 +304,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_node_invariants.png"/>
+			   fileref="../images/pbds_node_invariants.png"/>
 	      </imageobject>
 	      <textobject>
 		<phrase>Node Invariants</phrase>
@@ -333,7 +333,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_different_underlying_dss_1.png"/>
+			   fileref="../images/pbds_different_underlying_dss_1.png"/>
 	      </imageobject>
 	      <textobject>
 		<phrase>Underlying Associative Data Structures</phrase>
@@ -516,7 +516,7 @@ 
 	      <mediaobject>
 		<imageobject>
 		  <imagedata align="center" format="PNG" scale="100"
-			     fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_point_iterators_range_ops_1.png"/>
+			     fileref="../images/pbds_point_iterators_range_ops_1.png"/>
 		</imageobject>
 		<textobject>
 		  <phrase>Node Invariants</phrase>
@@ -597,7 +597,7 @@ 
 	      <mediaobject>
 		<imageobject>
 		  <imagedata align="center" format="PNG" scale="100"
-			     fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_point_iterators_range_ops_2.png"/>
+			     fileref="../images/pbds_point_iterators_range_ops_2.png"/>
 		</imageobject>
 		<textobject>
 		  <phrase>Point Iteration in Hash Data Structures</phrase>
@@ -638,7 +638,7 @@ 
 	      <mediaobject>
 		<imageobject>
 		  <imagedata align="center" format="PNG" scale="100"
-			     fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_invalidation_guarantee_erase.png"/>
+			     fileref="../images/pbds_invalidation_guarantee_erase.png"/>
 		</imageobject>
 		<textobject>
 		  <phrase>Effect of erase in different underlying data structures</phrase>
@@ -1028,7 +1028,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_different_underlying_dss_2.png"/>
+			   fileref="../images/pbds_different_underlying_dss_2.png"/>
 	      </imageobject>
 	      <textobject>
 		<phrase>Underlying Priority Queue Data Structures</phrase>
@@ -1326,7 +1326,7 @@ 
 	  </imageobject>
 	  <imageobject>
 	    <imagedata align="center" format="PNG" scale="100"
-		       fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_exception_hierarchy.png"/>
+		       fileref="../images/pbds_exception_hierarchy.png"/>
 	  </imageobject>
 	  <textobject>
 	    <phrase>Exception Hierarchy</phrase>
@@ -2359,7 +2359,7 @@ 
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata align="center" format="PNG" scale="100"
-			 fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_embedded_lists_1.png"/>
+			 fileref="../images/pbds_embedded_lists_1.png"/>
 	    </imageobject>
 	    <textobject>
 	      <phrase>Non-unique Mapping Standard Containers</phrase>
@@ -2385,7 +2385,7 @@ 
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata align="center" format="PNG" scale="100"
-			 fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_embedded_lists_2.png"/>
+			 fileref="../images/pbds_embedded_lists_2.png"/>
 	    </imageobject>
 	    <textobject>
 	      <phrase>
@@ -2513,7 +2513,7 @@ 
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata align="center" format="PNG" scale="100"
-			 fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_embedded_lists_3.png"/>
+			 fileref="../images/pbds_embedded_lists_3.png"/>
 	    </imageobject>
 	    <textobject>
 	      <phrase>Non-unique Mapping Containers</phrase>
@@ -2612,7 +2612,7 @@ 
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata align="center" format="PNG" scale="100"
-			 fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_point_iterator_hierarchy.png"/>
+			 fileref="../images/pbds_point_iterator_hierarchy.png"/>
 	    </imageobject>
 	    <textobject>
 	      <phrase>Point Iterator Hierarchy</phrase>
@@ -2684,7 +2684,7 @@ 
 	    </imageobject>
 	    <imageobject>
 	      <imagedata align="center" format="PNG" scale="100"
-			 fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_invalidation_tag_hierarchy.png"/>
+			 fileref="../images/pbds_invalidation_tag_hierarchy.png"/>
 	    </imageobject>
 	    <textobject>
 	      <phrase>Invalidation Guarantee Tags Hierarchy</phrase>
@@ -2843,7 +2843,7 @@ 
 	    </imageobject>
 	    <imageobject>
 	      <imagedata align="center" format="PNG" scale="100"
-			 fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_container_tag_hierarchy.png"/>
+			 fileref="../images/pbds_container_tag_hierarchy.png"/>
 	    </imageobject>
 	    <textobject>
 	      <phrase>Container Tag Hierarchy</phrase>
@@ -3016,7 +3016,7 @@ 
 	      <mediaobject>
 		<imageobject>
 		  <imagedata align="center" format="PNG" scale="100"
-			     fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_hash_ranged_hash_range_hashing_fns.png"/>
+			     fileref="../images/pbds_hash_ranged_hash_range_hashing_fns.png"/>
 		</imageobject>
 		<textobject>
 		  <phrase>Hash functions, ranged-hash functions, and
@@ -3292,7 +3292,7 @@ 
 		<mediaobject>
 		  <imageobject>
 		    <imagedata align="center" format="PNG" scale="100"
-			       fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_hash_range_hashing_seq_diagram.png"/>
+			       fileref="../images/pbds_hash_range_hashing_seq_diagram.png"/>
 		  </imageobject>
 		  <textobject>
 		    <phrase>Insert hash sequence diagram</phrase>
@@ -3312,7 +3312,7 @@ 
 		<mediaobject>
 		  <imageobject>
 		    <imagedata align="center" format="PNG" scale="100"
-			       fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_hash_range_hashing_seq_diagram2.png"/>
+			       fileref="../images/pbds_hash_range_hashing_seq_diagram2.png"/>
 		  </imageobject>
 		  <textobject>
 		    <phrase>Insert hash sequence diagram with a null policy</phrase>
@@ -3368,7 +3368,7 @@ 
 		<mediaobject>
 		  <imageobject>
 		    <imagedata align="center" format="PNG" scale="100"
-			       fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_hash_policy_cd.png"/>
+			       fileref="../images/pbds_hash_policy_cd.png"/>
 		  </imageobject>
 		  <textobject>
 		    <phrase>Hash policy class diagram</phrase>
@@ -3458,7 +3458,7 @@ 
 	      <mediaobject>
 		<imageobject>
 		  <imagedata align="center" format="PNG" scale="100"
-			     fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_balls_and_bins.png"/>
+			     fileref="../images/pbds_balls_and_bins.png"/>
 		</imageobject>
 		<textobject>
 		  <phrase>Balls and bins</phrase>
@@ -3579,7 +3579,7 @@ 
 		<mediaobject>
 		  <imageobject>
 		    <imagedata align="center" format="PNG" scale="100"
-			       fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_insert_resize_sequence_diagram1.png"/>
+			       fileref="../images/pbds_insert_resize_sequence_diagram1.png"/>
 		  </imageobject>
 		  <textobject>
 		    <phrase>Insert resize sequence diagram</phrase>
@@ -3607,7 +3607,7 @@ 
 		<mediaobject>
 		  <imageobject>
 		    <imagedata align="center" format="PNG" scale="100"
-			       fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_insert_resize_sequence_diagram2.png"/>
+			       fileref="../images/pbds_insert_resize_sequence_diagram2.png"/>
 		  </imageobject>
 		  <textobject>
 		    <phrase>Standard resize policy trigger sequence
@@ -3622,7 +3622,7 @@ 
 		<mediaobject>
 		  <imageobject>
 		    <imagedata align="center" format="PNG" scale="100"
-			       fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_insert_resize_sequence_diagram3.png"/>
+			       fileref="../images/pbds_insert_resize_sequence_diagram3.png"/>
 		  </imageobject>
 		  <textobject>
 		    <phrase>Standard resize policy size sequence
@@ -3929,7 +3929,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_tree_node_invariants.png"/>
+			   fileref="../images/pbds_tree_node_invariants.png"/>
 	      </imageobject>
 	      <textobject>
 		<phrase>Tree node invariants</phrase>
@@ -3968,7 +3968,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_tree_node_invalidations.png"/>
+			   fileref="../images/pbds_tree_node_invalidations.png"/>
 	      </imageobject>
 	      <textobject>
 		<phrase>Tree node invalidation</phrase>
@@ -4027,7 +4027,7 @@ 
 	      <mediaobject>
 		<imageobject>
 		  <imagedata align="center" format="PNG" scale="100"
-			     fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_tree_node_updator_policy_cd.png"/>
+			     fileref="../images/pbds_tree_node_updator_policy_cd.png"/>
 		</imageobject>
 		<textobject>
 		  <phrase>A tree and its update policy</phrase>
@@ -4067,7 +4067,7 @@ 
 	      <mediaobject>
 		<imageobject>
 		  <imagedata align="center" format="PNG" scale="100"
-			     fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_restoring_node_invariants.png"/>
+			     fileref="../images/pbds_restoring_node_invariants.png"/>
 		</imageobject>
 		<textobject>
 		  <phrase>Restoring node invariants</phrase>
@@ -4090,7 +4090,7 @@ 
 	      <mediaobject>
 		<imageobject>
 		  <imagedata align="center" format="PNG" scale="100"
-			     fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_update_seq_diagram.png"/>
+			     fileref="../images/pbds_update_seq_diagram.png"/>
 		</imageobject>
 		<textobject>
 		  <phrase>Insert update sequence</phrase>
@@ -4176,7 +4176,7 @@ 
 	      <mediaobject>
 		<imageobject>
 		  <imagedata align="center" format="PNG" scale="100"
-			     fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_rationale_null_node_updator.png"/>
+			     fileref="../images/pbds_rationale_null_node_updator.png"/>
 		</imageobject>
 		<textobject>
 		  <phrase>Useless update path</phrase>
@@ -4375,7 +4375,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_pat_trie.png"/>
+			   fileref="../images/pbds_pat_trie.png"/>
 	      </imageobject>
 	      <textobject>
 		<phrase>A PATRICIA trie</phrase>
@@ -4413,7 +4413,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_trie_node_updator_policy_cd.png"/>
+			   fileref="../images/pbds_trie_node_updator_policy_cd.png"/>
 	      </imageobject>
 	      <textobject>
 		<phrase>A trie and its update policy</phrase>
@@ -4548,7 +4548,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_simple_list.png"/>
+			   fileref="../images/pbds_simple_list.png"/>
 	      </imageobject>
 	      <textobject>
 		<phrase>A simple list</phrase>
@@ -4575,7 +4575,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_list_update.png"/>
+			   fileref="../images/pbds_list_update.png"/>
 	      </imageobject>
 	      <textobject>
 		<phrase>The counter algorithm</phrase>
@@ -4873,7 +4873,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_priority_queue_different_underlying_dss.png"/>
+			   fileref="../images/pbds_priority_queue_different_underlying_dss.png"/>
 	      </imageobject>
 	      <textobject>
 		<phrase>Underlying Priority-Queue Data-Structures.</phrase>
@@ -4997,7 +4997,7 @@ 
 	    <mediaobject>
 	      <imageobject>
 		<imagedata align="center" format="PNG" scale="100"
-			   fileref="/mnt/share/src/gcc.svn-trunk/libstdc++-v3/doc/xml/images/pbds_priority_queue_tag_hierarchy.png"/>
+			   fileref="../images/pbds_priority_queue_tag_hierarchy.png"/>
 	      </imageobject>
 	      <textobject>
 		<phrase>Priority-Queue Data-Structure Tags.</phrase>
Index: doc/Makefile.am
===================================================================
--- doc/Makefile.am	(revision 177416)
+++ doc/Makefile.am	(working copy)
@@ -136,16 +136,9 @@ 
 
 # HTML
 htmldir="$(DESTDIR)@docdir@"
-stamp-html: stamp-html-copy stamp-html-doxygen
+stamp-html: stamp-html-docbook-data stamp-html-doxygen
 	$(STAMP) stamp-html
 
-copydir=${docbook_outdir}/html/manual/ext/
-stamp-html-copy: stamp-html-docbook
-	cp -r ${top_srcdir}/doc/html/ext ${docbook_outdir}/html/manual/ext
-	cd ${docbook_outdir}/html/manual/ext
-	rm -rf ${docbook_outdir}/html/manual/ext/.svn 
-	$(STAMP) stamp-html-copy
-
 doc-html: stamp-html
 
 doc-install-html: doc-html
@@ -367,13 +360,97 @@ 
 	${xml_sources_manual} \
 	${xml_sources_extra}
 
+image_dir = ${xml_dir}/images
+xml_images = \
+	${image_dir}/confdeps.png \
+	${image_dir}/pbds_balls_and_bins.png \
+	${image_dir}/pbds_binary_priority_queue_random_int_push_timing_test_local.png \
+	${image_dir}/pbds_cc_hash_random_int_find_timing_test_local.png \
+	${image_dir}/pbds_cc_hash_random_int_subscript_timing_test_find_local.png \
+	${image_dir}/pbds_cc_hash_random_int_subscript_timing_test_insert_local.png \
+	${image_dir}/pbds_container_tag_hierarchy.png \
+	${image_dir}/pbds_different_underlying_dss_1.png \
+	${image_dir}/pbds_different_underlying_dss_2.png \
+	${image_dir}/pbds_embedded_lists_1.png \
+	${image_dir}/pbds_embedded_lists_2.png \
+	${image_dir}/pbds_embedded_lists_3.png \
+	${image_dir}/pbds_exception_hierarchy.png \
+	${image_dir}/pbds_gp_hash_random_int_find_timing_test_local.png \
+	${image_dir}/pbds_gp_hash_random_int_subscript_timing_test_find_local.png \
+	${image_dir}/pbds_gp_hash_random_int_subscript_timing_test_insert_local.png \
+	${image_dir}/pbds_hash_policy_cd.png \
+	${image_dir}/pbds_hash_random_int_erase_mem_usage_test_local.png \
+	${image_dir}/pbds_hash_ranged_hash_range_hashing_fns.png \
+	${image_dir}/pbds_hash_range_hashing_seq_diagram2.png \
+	${image_dir}/pbds_hash_range_hashing_seq_diagram.png \
+	${image_dir}/pbds_hash_zlob_random_int_find_timing_test_local.png \
+	${image_dir}/pbds_insert_resize_sequence_diagram1.png \
+	${image_dir}/pbds_insert_resize_sequence_diagram2.png \
+	${image_dir}/pbds_insert_resize_sequence_diagram3.png \
+	${image_dir}/pbds_invalidation_guarantee_erase.png \
+	${image_dir}/pbds_invalidation_tag_hierarchy.png \
+	${image_dir}/pbds_list_update.png \
+	${image_dir}/pbds_multimap_text_find_timing_test_large_s2p_hash_local.png \
+	${image_dir}/pbds_multimap_text_find_timing_test_large_s2p_tree_local.png \
+	${image_dir}/pbds_multimap_text_find_timing_test_small_s2p_hash_local.png \
+	${image_dir}/pbds_multimap_text_find_timing_test_small_s2p_tree_local.png \
+	${image_dir}/pbds_multimap_text_insert_mem_usage_test_large_s2p_hash_local.png \
+	${image_dir}/pbds_multimap_text_insert_mem_usage_test_large_s2p_tree_local.png \
+	${image_dir}/pbds_multimap_text_insert_mem_usage_test_small_s2p_hash_local.png \
+	${image_dir}/pbds_multimap_text_insert_mem_usage_test_small_s2p_tree_local.png \
+	${image_dir}/pbds_multimap_text_insert_timing_test_large_s2p_hash_local.png \
+	${image_dir}/pbds_multimap_text_insert_timing_test_large_s2p_tree_local.png \
+	${image_dir}/pbds_multimap_text_insert_timing_test_small_s2p_hash_local.png \
+	${image_dir}/pbds_multimap_text_insert_timing_test_small_s2p_tree_local.png \
+	${image_dir}/pbds_node_invariants.png \
+	${image_dir}/pbds_pairing_priority_queue_text_push_pop_timing_test_local.png \
+	${image_dir}/pbds_pairing_priority_queue_text_push_timing_test_local.png \
+	${image_dir}/pbds_pat_trie.png \
+	${image_dir}/pbds_point_iterator_hierarchy.png \
+	${image_dir}/pbds_point_iterators_range_ops_1.png \
+	${image_dir}/pbds_point_iterators_range_ops_2.png \
+	${image_dir}/pbds_priority_queue_different_underlying_dss.png \
+	${image_dir}/pbds_priority_queue_random_int_push_pop_timing_test_local.png \
+	${image_dir}/pbds_priority_queue_random_int_push_timing_test_local.png \
+	${image_dir}/pbds_priority_queue_tag_hierarchy.png \
+	${image_dir}/pbds_priority_queue_text_join_timing_test_local.png \
+	${image_dir}/pbds_priority_queue_text_modify_down_timing_test_local.png \
+	${image_dir}/pbds_priority_queue_text_modify_down_timing_test_pairing_thin_local.png \
+	${image_dir}/pbds_priority_queue_text_modify_up_timing_test_local.png \
+	${image_dir}/pbds_priority_queue_text_modify_up_timing_test_pairing_thin_local.png \
+	${image_dir}/pbds_priority_queue_text_pop_mem_usage_test_local.png \
+	${image_dir}/pbds_priority_queue_text_push_pop_timing_test_local.png \
+	${image_dir}/pbds_priority_queue_text_push_timing_test_local.png \
+	${image_dir}/pbds_rationale_null_node_updator.png \
+	${image_dir}/pbds_resize_policy_cd.png \
+	${image_dir}/pbds_restoring_node_invariants.png \
+	${image_dir}/pbds_simple_list.png \
+	${image_dir}/pbds_text_find_timing_test_hash_local.png \
+	${image_dir}/pbds_text_find_timing_test_tree_like_local.png \
+	${image_dir}/pbds_tree_node_invalidations.png \
+	${image_dir}/pbds_tree_node_invariants.png \
+	${image_dir}/pbds_tree_node_updator_policy_cd.png \
+	${image_dir}/pbds_tree_order_statistics_timing_test_local.png \
+	${image_dir}/pbds_tree_split_join_timing_test_local.png \
+	${image_dir}/pbds_tree_text_insert_timing_test_node_tree_local.png \
+	${image_dir}/pbds_tree_text_insert_timing_test_pat_trie_local.png \
+	${image_dir}/pbds_tree_text_insert_timing_test_vector_tree_local.png \
+	${image_dir}/pbds_tree_text_lor_find_timing_test_local.png \
+	${image_dir}/pbds_trie_node_updator_policy_cd.png \
+	${image_dir}/pbds_update_seq_diagram.png
+
+xml_extradir = ${glibcxx_srcdir}/doc/html/ext
+xml_extra = \
+	${xml_extradir}/lwg-active.html \
+	${xml_extradir}/lwg-closed.html \
+	${xml_extradir}/lwg-defects.html 
+
 xml_noinst = \
 	${xml_dir}/book.txml \
 	${xml_dir}/chapter.txml \
 	${xml_dir}/class.txml \
-	${xml_dir}/images/confdeps.dot \
-	${xml_dir}/images/confdeps.png \
-	${xml_dir}/images/confdeps.pdf
+	${image_dir}/confdeps.dot \
+	${image_dir}/confdeps.pdf
 
 XSLTPROC       = xsltproc
 XSLT_FLAGS = --nonet --xinclude
@@ -393,6 +470,8 @@ 
 
 ${docbook_outdir}/html:
 	mkdir -p ${docbook_outdir}/html
+	mkdir -p ${docbook_outdir}/html/images
+	mkdir -p ${docbook_outdir}/html/manual/ext
 
 ${docbook_outdir}/pdf:
 	mkdir -p ${docbook_outdir}/pdf
@@ -410,7 +489,7 @@ 
 #SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
 XMLLINT_VALID_FLAGS = $(LINT_FLAGS) --dtdvalid $(SCHEMA_FLAGS)
 XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata
-doc-xml-validate-docbook: $(xml_sources)
+doc-xml-validate-docbook: $(xml_sources) $(xml_images)
 	@echo "Generating XML validation log..."
 	$(XMLLINT) $(XMLLINT_VALID_FLAGS) ${top_srcdir}/doc/xml/spine.xml
 
@@ -432,6 +511,18 @@ 
 
 doc-xml-single-docbook: stamp-xml-single-docbook
 
+# HTML support files
+stamp-html-docbook-images: stamp-html-docbook $(xml_images)
+	$(INSTALL_DATA)	$(xml_images) ${docbook_outdir}/html/images
+	$(STAMP) stamp-html-docbook-images
+
+stamp-html-docbook-lwg: stamp-html-docbook $(xml_extra)
+	$(INSTALL_DATA)	$(xml_extra) ${docbook_outdir}/html/manual/ext
+	$(STAMP) stamp-html-docbook-lwg
+
+stamp-html-docbook-data: stamp-html-docbook-images stamp-html-docbook-lwg
+	$(STAMP) stamp-html-docbook-data
+
 # HTML, index plus chapters
 stamp-html-docbook: $(xml_sources) ${docbook_outdir}/html
 	@echo "Generating html files..."
@@ -439,7 +530,7 @@ 
 	$(XSL_HTML_STYLE) ${top_srcdir}/doc/xml/spine.xml
 	$(STAMP) stamp-html-docbook
 
-doc-html-docbook: stamp-html-docbook
+doc-html-docbook: stamp-html-docbook-data
 
 # HTML, all one page
 manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html
@@ -462,10 +553,11 @@ 
 
 # PDF, via dblatex
 manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf
-DBLATEX_FLAGS = --dump --verbose --pdf -o ${manual_pdf}
+DBLATEX_FLAGS = --dump --verbose --pdf 
 stamp-pdf-docbook: $(xml_sources) ${docbook_outdir}/pdf
 	@echo "Generating pdf dblatex files..."
-	dblatex $(DBLATEX_FLAGS) ${top_srcdir}/doc/xml/spine.xml
+	dblatex $(DBLATEX_FLAGS) \
+	-o ${manual_pdf} ${top_srcdir}/doc/xml/spine.xml
 	$(STAMP) stamp-pdf-docbook
 
 doc-pdf-docbook: stamp-pdf-docbook