[Fontconfig] fontconfig: Branch 'master'

[GitLab Mirror]

 doc/Makefile.am |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 189685365a731f2e25485186ef93960496f78ad3
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Jun 21 09:55:42 2019 +0000

    Don't clean up pre-built docs if no docbook installed.
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/165

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2194ab7..2cb6410 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -33,11 +33,25 @@ EXTRA_DIST =			\
 	confdir.sgml.in		\
 	func.sgml		\
 	$(NULL)
-MAINTAINERCLEANFILES =		\
-	$(DOC_FUNCS_SGML)	\
+if USEDOCBOOK
+maintainerdoccleanfiles =	\
 	$(NULL)
-CLEANFILES =			\
+cleandocfiles =			\
+	$(BUILT_DOCS)		\
+	$(NULL)
+else
+maintainerdoccleanfiles =	\
 	$(BUILT_DOCS)		\
+	$(NULL)
+cleandocfiles =			\
+	$(NULL)
+endif
+MAINTAINERCLEANFILES =			\
+	$(DOC_FUNCS_SGML)		\
+	$(maintainerdoccleanfiles)	\
+	$(NULL)
+CLEANFILES =			\
+	$(cleandocfiles)	\
 	$(LOCAL_SGML_FILES)	\
 	confdir.sgml		\
 	func.refs		\