From 74920cac5b5f9acda98254cfa4564c25079c091b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 Apr 2004 23:29:19 +0000
Subject: Fix path to images. CSS path doesn't work yet - I'll have a look at
 that tomorrow (This used to be commit
 0666499b1dffb5c1e9c0465b745fd1e5d7deefc6)

---
 docs/Makefile.in              |  5 +----
 docs/xslt/expand-sambadoc.xsl | 12 +++++++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/docs/Makefile.in b/docs/Makefile.in
index 4583ce5ff0..93ba6bf638 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -104,10 +104,7 @@ txt: $(TXTDIR) $(TXTDIR)/Samba-HOWTO-Collection.txt $(TXTDIR)/Samba-Developers-G
 htmlman: $(HTMLDIR) $(MANPAGES_HTML) $(HTMLDIR)/CSS
 
 html-single: $(HTMLDIR) $(HTMLDIR)/CSS $(HTMLDIR)/Samba-HOWTO-Collection.html  $(HTMLDIR)/Samba-Developers-Guide.html $(HTMLDIR)/Samba-Guide.html
-	@if [ ! -d $(HTMLDIR)/images/ ]; then \
-		mkdir $(HTMLDIR)/images/; \
-	fi \
-	&& cp -p $(IMAGEPROJDIR)/*png $(HTMLDIR)/images/
+	cp -p $(GUIDEDOC_IMAGES_PNG) $(HOWTODIR_IMAGES_PNG) $(HTMLDIR)/images/
 
 html: $(HTMLDIR)/howto $(HTMLDIR)/guide $(HTMLDIR)/devel
 	
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index 217f621f80..8bb765b7d9 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -270,13 +270,23 @@
 					</xsl:element>
 				</xsl:element>
 				<xsl:element name="imageobject">
+					<xsl:attribute name="role"><xsl:text>html</xsl:text></xsl:attribute>
 					<xsl:element name="imagedata">
 						<xsl:attribute name="fileref">
-							<xsl:text>howto/imagefiles/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
+							<xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
 						<xsl:attribute name="scale"><xsl:text>50</xsl:text></xsl:attribute>
 						<xsl:attribute name="scalefit"><xsl:text>1</xsl:text></xsl:attribute>
 					</xsl:element>
 				</xsl:element>
+				<xsl:element name="imageobject">
+					<xsl:element name="imagedata">
+						<xsl:attribute name="fileref">
+							<xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
+						<xsl:attribute name="scale"><xsl:text>50</xsl:text></xsl:attribute>
+						<xsl:attribute name="scalefit"><xsl:text>1</xsl:text></xsl:attribute>
+					</xsl:element>
+				</xsl:element>
+
 			</xsl:element>
 		</xsl:element>
 	</xsl:template>
-- 
cgit