A VPATH build of fontconfig-2.4.1 fails for various reasons. Bug 8933.

VPATH builds without doctools breaks as it cannot find the distributed
pre-formatted documentation.

diff --git a/configure.in b/configure.in
index 2029510bb97ee9630daa2dffa402428c2fc3d694..ef37acddbac2d9435d1f22d8223d13f74aaf0c97 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -510,7 +510,7 @@ default_docs="yes"
 # Check if docs exist or can be created
 #
 if test x$HASDOCBOOK = xno; then
-       if test -f doc/fonts-conf.5; then
+       if test -f $srcdir/doc/fonts-conf.5; then
                :
        else
                default_docs="no"

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3477eb77770cb3b99aab50efe5ac3ab870b33bdc..5641dd9949d8586ff8733917a8176ef766a0af73 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -142,7 +142,7 @@ fontconfig-devel.txt: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml
 
 fontconfig-devel.pdf: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
        $(RM) $@
-       ../missing --run $(DOC2PDF) $< && mv local-$@ $@ \
+       $(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \
        || echo Failed to generate $@ >&2; \
        (test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@)
 
@@ -160,7 +160,7 @@ fontconfig-user.txt: local-fontconfig-user.sgml version.sgml confdir.sgml
 
 fontconfig-user.pdf: local-fontconfig-user.sgml version.sgml confdir.sgml
        $(RM) $@
-       ../missing --run $(DOC2PDF) $< && mv local-$@ $@ \
+       $(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \
        || echo Failed to generate $@ >&2; \
        (test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@)
 
@@ -170,7 +170,14 @@ confdir.sgml: ${DOC_SRC}/confdir.sgml.in
 
 CLEANFILES=confdir.sgml local-fontconfig-user.sgml local-fontconfig-devel.sgml
 
+htmldoc_DATA = $(HTML_DIR)/*
+
+$(HTML_DIR)/*: $(HTML_DIR)
+
 else
+
+htmldoc_DATA = $(srcdir)/$(HTML_DIR)/*
+
 all-local:
 clean-local:
 endif
@@ -179,6 +186,3 @@ htmldocdir=$(docdir)/$(HTML_DIR)
 
 doc_DATA = $(DOC_FILES)
 
-htmldoc_DATA = $(HTML_DIR)/*
-
-$(HTML_DIR)/*: $(HTML_DIR)