From: Peter Krempa <pkrempa@redhat.com> 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> --- docs/go/meson.build | 3 ++- docs/html/meson.build | 3 ++- docs/kbase/internals/meson.build | 3 ++- docs/kbase/meson.build | 3 ++- docs/logos/meson.build | 3 ++- docs/manpages/meson.build | 3 ++- docs/meson.build | 3 ++- docs/site.xsl | 4 ++-- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/docs/go/meson.build b/docs/go/meson.build index 29467c61f0..102516a6cc 100644 --- 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 abb4fcf72a..c6f1478c78 100644 --- 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 f1e9122f8f..1d637e0455 100644 --- 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 6d4ca90215..90cdbe8a23 100644 --- 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 2d9d0fcbb0..dec544fa67 100644 --- 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 bdc17011a8..72c8c0461d 100644 --- 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 2c7c23271b..651b1d91c6 100644 --- 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 5a5fea2350..13b720bd40 100644 --- 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> -- 2.51.1