docs: html: copy images to output as part of xslt build

Until now the meson built HTML docs had non-working references to images. They
were copied in the make target. Instead of duplicating that for meson, copy
them as part of the xslt stylesheet.

Reported-by: Peter Eisentraut 
Discussion: https://postgr.es/m/3fc3bb9b-f7f8-d442-35c1-ec82280c564a@enterprisedb.com

diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 3c4aa6bebe33e6b15c1fa1ccf6984d13828bed18..11ecdaf717eb5395ec2cac19f8743738ea55df37 100644 (file)
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -144,7 +144,6 @@ html: html-stamp
 
 html-stamp: stylesheet.xsl postgres-full.xml $(ALL_IMAGES)
    $(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) $(wordlist 1,2,$^)
-   cp $(ALL_IMAGES) html/
    cp $(srcdir)/stylesheet.css html/
    touch $@
 

diff --git a/doc/src/sgml/stylesheet-common.xsl b/doc/src/sgml/stylesheet-common.xsl
index 761484c7fefa9af3efd0e83f2844ddec1fa70b9c..d2928f86eb749d8a2acb95363ee2eec8f3df2925 100644 (file)
--- a/doc/src/sgml/stylesheet-common.xsl
+++ b/doc/src/sgml/stylesheet-common.xsl
@@ -101,4 +101,26 @@
   
 
 
+
+
+
+ 
+   
+ 
+
+ 
+ 
+   
+ 
+
+ 
+  
+  
+ 
+
+
+
 

diff --git a/doc/src/sgml/stylesheet.xsl b/doc/src/sgml/stylesheet.xsl
index b6141303abd2f4542154c9fef4ac4637313d97a1..c492dc38e54f15aaee069e068ada3b0c54095b49 100644 (file)
--- a/doc/src/sgml/stylesheet.xsl
+++ b/doc/src/sgml/stylesheet.xsl
@@ -29,6 +29,12 @@
 
 
 
+
+
+  
+  
+
+