docs: site.xsl: Use separate 'asset_href_base' and 'link_href_base'

While our main page uses same argument for both to ensure that the
linking works also when browsed locally sub-projects such as
libvirt-wiki and libvirt-security-notice will want to pull 'site.xsl' as
is into their build assets. Pass both arguments via the build system so
that we don't have to carry distinct instances.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/docs/go/meson.build b/docs/go/meson.build
index 29467c61f09c5b632d9b754b4a86f9063d97b1cd..102516a6cce03fa7cff6fda939d81a73f8e6bdb3 100644 (file)
--- a/docs/go/meson.build
+++ b/docs/go/meson.build
@@ -33,7 +33,8 @@ foreach data : html_xslt_gen
       '--stringparam', 'pagesrc', data.get('source', ''),
       '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
-      '--stringparam', 'href_base', data.get('href_base', ''),
+      '--stringparam', 'link_href_base', data.get('href_base', ''),
+      '--stringparam', 'asset_href_base', data.get('href_base', ''),
       '--nonet',
       site_xsl,
       '@INPUT@',

diff --git a/docs/html/meson.build b/docs/html/meson.build
index abb4fcf72a636227b3c24c77a14418f80085d602..c6f1478c7898e9fa41e20da20ea7b8abcde65d85 100644 (file)
--- a/docs/html/meson.build
+++ b/docs/html/meson.build
@@ -101,7 +101,8 @@ foreach data : html_xslt_gen
       '--stringparam', 'pagesrc', data.get('source', ''),
       '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
-      '--stringparam', 'href_base', data.get('href_base', ''),
+      '--stringparam', 'link_href_base', data.get('href_base', ''),
+      '--stringparam', 'asset_href_base', data.get('href_base', ''),
       '--nonet',
       site_xsl,
       '@INPUT@',

diff --git a/docs/kbase/internals/meson.build b/docs/kbase/internals/meson.build
index f1e9122f8fa5ba959b12ab8f54732ca09fddb0a9..1d637e0455453379aa2221fb9d32ba5c34021d99 100644 (file)
--- a/docs/kbase/internals/meson.build
+++ b/docs/kbase/internals/meson.build
@@ -42,7 +42,8 @@ foreach data : html_xslt_gen
       '--stringparam', 'pagesrc', data.get('source', ''),
       '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
-      '--stringparam', 'href_base', data.get('href_base', ''),
+      '--stringparam', 'link_href_base', data.get('href_base', ''),
+      '--stringparam', 'asset_href_base', data.get('href_base', ''),
       '--nonet',
       site_xsl,
       '@INPUT@',

diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build
index 6d4ca90215a57fcad0cae3cd19cb964398b18779..90cdbe8a235443005a996753c553fb549ead1471 100644 (file)
--- a/docs/kbase/meson.build
+++ b/docs/kbase/meson.build
@@ -53,7 +53,8 @@ foreach data : html_xslt_gen
       '--stringparam', 'pagesrc', data.get('source', ''),
       '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
-      '--stringparam', 'href_base', data.get('href_base', ''),
+      '--stringparam', 'link_href_base', data.get('href_base', ''),
+      '--stringparam', 'asset_href_base', data.get('href_base', ''),
       '--nonet',
       site_xsl,
       '@INPUT@',

diff --git a/docs/logos/meson.build b/docs/logos/meson.build
index 2d9d0fcbb0831b1d658e273cd1a5f642df4885c0..dec544fa67bde3e5ad077069de67da72b85b1d74 100644 (file)
--- a/docs/logos/meson.build
+++ b/docs/logos/meson.build
@@ -62,7 +62,8 @@ foreach data : html_xslt_gen
       '--stringparam', 'pagesrc', data.get('source', ''),
       '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
-      '--stringparam', 'href_base', data.get('href_base', ''),
+      '--stringparam', 'link_href_base', data.get('href_base', ''),
+      '--stringparam', 'asset_href_base', data.get('href_base', ''),
       '--nonet',
       site_xsl,
       '@INPUT@',

diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
index bdc17011a890dde93152dafcb7be98fd9e4f05d6..72c8c0461da67a256f94e8ada2d7fee3348898ec 100644 (file)
--- a/docs/manpages/meson.build
+++ b/docs/manpages/meson.build
@@ -152,7 +152,8 @@ foreach data : html_xslt_gen
       '--stringparam', 'pagesrc', data.get('source', ''),
       '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
-      '--stringparam', 'href_base', data.get('href_base', ''),
+      '--stringparam', 'link_href_base', data.get('href_base', ''),
+      '--stringparam', 'asset_href_base', data.get('href_base', ''),
       '--nonet',
       site_xsl,
       '@INPUT@',

diff --git a/docs/meson.build b/docs/meson.build
index 2c7c23271be5fef67c706d8e67ab94e3672375dc..651b1d91c6d79c7f5761606fa973d2fb2f1dd980 100644 (file)
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -301,7 +301,8 @@ foreach data : html_xslt_gen
       '--stringparam', 'pagesrc', data.get('source', ''),
       '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
-      '--stringparam', 'href_base', data.get('href_base', ''),
+      '--stringparam', 'link_href_base', data.get('href_base', ''),
+      '--stringparam', 'asset_href_base', data.get('href_base', ''),
       '--nonet',
       site_xsl,
       '@INPUT@',

diff --git a/docs/site.xsl b/docs/site.xsl
index 5a5fea23501d48259097c9c563dc0d03dbef9134..13b720bd4027e877c37b25fc5ee73d64de919645 100644 (file)
--- a/docs/site.xsl
+++ b/docs/site.xsl
@@ -28,8 +28,8 @@
     <xsl:apply-templates select="." mode="page">
       <xsl:with-param name="pagesrc" select="$pagesrc"/>
       <xsl:with-param name="timestamp" select="$timestamp"/>
-      <xsl:with-param name="link_href_base" select="$href_base"/>
-      <xsl:with-param name="asset_href_base" select="$href_base"/>
+      <xsl:with-param name="link_href_base" select="$link_href_base"/>
+      <xsl:with-param name="asset_href_base" select="$asset_href_base"/>
     </xsl:apply-templates>
   </xsl:template>