From f84cba41e707ab04bf7a69b7520c3f7502217c02 Mon Sep 17 00:00:00 2001 From: Knut Omang Date: Thu, 20 Dec 2018 19:38:31 +0100 Subject: [PATCH] Minor fixes in doc to build docs on fc29 - Small fix in kernel-doc - Fix subtle Makefile doc build error due to output changes from Sphinx. Change-Id: Ia026a58ec0e76a90884d154ae97ef18c1ed21aac Signed-off-by: Knut Omang Reviewed-on: https://review.no.oracle.com:8443/15503 Pre-check: franklin Reviewed-by: Alan Maguire Tested-by: franklin --- doc/Makefile.am | 4 ++-- doc/sphinx/kernel-doc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 9219ad6..254f8d8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -23,11 +23,11 @@ help: htmldocs: $(TARGETS) $(TARGETS): Makefile $(srcdir)/*.txt - @if test x$V != x1; then export Q="-q"; echo -n " HTMLDOC "`pwd`; fi; \ + @if test x$V != x1; then export Q="-q"; echo -n " HTMLDOC $$(pwd)"; fi; \ $(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $$Q $(SPHINXOPTS) $(O) | \ if test x$V != x1; then grep -v 'Build finished'; else cat -; fi; \ $(SPHINXBUILD) -M htmlhelp "$(SOURCEDIR)" "$(BUILDDIR)" $$Q $(SPHINXOPTS) $(O) | \ - if test x$V != x1; then grep -v 'Build finished'; else cat -; fi + if test x$V != x1; then grep -v 'Build finished' || echo ""; else cat -; fi @rsync -a html/_sources htmlhelp/ clean-local: diff --git a/doc/sphinx/kernel-doc b/doc/sphinx/kernel-doc index be16e17..9ac2102 100755 --- a/doc/sphinx/kernel-doc +++ b/doc/sphinx/kernel-doc @@ -2172,7 +2172,7 @@ sub dump_struct($$) { my $members = $3; # ignore embedded structs or unions - $members =~ s/({.*})//g; + $members =~ s/(\{.*\})//g; $nested = $1; # ignore members marked private: