From 7e431a521cecbb2626c1ee4ddf9c73c810e4288c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Wed, 17 Jul 2019 16:28:54 +0200 Subject: [PATCH] docs: news: remove sed sorcery MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set a default namespace in the stylesheet instead. Signed-off-by: Ján Tomko Acked-by: Peter Krempa Reviewed-by: Andrea Bolognani --- docs/Makefile.am | 10 ++-------- docs/news-html.xsl | 4 +++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 1cfa38dc80..ae2673ca9b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -236,20 +236,14 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ $(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(top_srcdir)/src > $@ \ || { rm $@ && exit 1; } -# xsltproc seems to add the xmlns="" attribute to random output elements: -# use sed to strip it out, as leaving it there triggers XML errors during -# further transformation steps news.html.in: \ $(srcdir)/news.xml \ $(srcdir)/news-html.xsl $(AM_V_GEN)$(XSLTPROC) --nonet \ $(srcdir)/news-html.xsl \ $(srcdir)/news.xml \ - >$@-tmp \ - || { rm -f $@-tmp; exit 1; }; \ - sed 's/ xmlns=""//g' $@-tmp >$@ \ - || { rm -f $@-tmp; exit 1; }; \ - rm -f $@-tmp + >$@ \ + || { rm -f $@; exit 1; }; EXTRA_DIST += \ $(srcdir)/news.xml \ $(srcdir)/news.rng \ diff --git a/docs/news-html.xsl b/docs/news-html.xsl index 2b02578cb9..b9f624cff0 100644 --- a/docs/news-html.xsl +++ b/docs/news-html.xsl @@ -1,5 +1,7 @@ - +