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 <[email protected]> Reviewed-on: https://review.no.oracle.com:8443/15503 Pre-check: franklin <[email protected]> Reviewed-by: Alan Maguire <[email protected]> Tested-by: franklin <[email protected]>
alan-maguire · Jan 11, 2019 · f84cba4 · f84cba4
1 parent 174b6c0
commit f84cba4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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: