Commit 2cae0512 authored by Peter Breitenlohner's avatar Peter Breitenlohner Committed by Keith Packard
Browse files

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.
parent 0f963b0d
...@@ -510,7 +510,7 @@ default_docs="yes" ...@@ -510,7 +510,7 @@ default_docs="yes"
# Check if docs exist or can be created # Check if docs exist or can be created
# #
if test x$HASDOCBOOK = xno; then if test x$HASDOCBOOK = xno; then
if test -f doc/fonts-conf.5; then if test -f $srcdir/doc/fonts-conf.5; then
: :
else else
default_docs="no" default_docs="no"
......
...@@ -142,7 +142,7 @@ fontconfig-devel.txt: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml ...@@ -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 fontconfig-devel.pdf: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
$(RM) $@ $(RM) $@
../missing --run $(DOC2PDF) $< && mv local-$@ $@ \ $(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \
|| echo Failed to generate $@ >&2; \ || echo Failed to generate $@ >&2; \
(test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@) (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 ...@@ -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 fontconfig-user.pdf: local-fontconfig-user.sgml version.sgml confdir.sgml
$(RM) $@ $(RM) $@
../missing --run $(DOC2PDF) $< && mv local-$@ $@ \ $(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \
|| echo Failed to generate $@ >&2; \ || echo Failed to generate $@ >&2; \
(test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@) (test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@)
...@@ -170,7 +170,14 @@ confdir.sgml: ${DOC_SRC}/confdir.sgml.in ...@@ -170,7 +170,14 @@ confdir.sgml: ${DOC_SRC}/confdir.sgml.in
CLEANFILES=confdir.sgml local-fontconfig-user.sgml local-fontconfig-devel.sgml CLEANFILES=confdir.sgml local-fontconfig-user.sgml local-fontconfig-devel.sgml
htmldoc_DATA = $(HTML_DIR)/*
$(HTML_DIR)/*: $(HTML_DIR)
else else
htmldoc_DATA = $(srcdir)/$(HTML_DIR)/*
all-local: all-local:
clean-local: clean-local:
endif endif
...@@ -179,6 +186,3 @@ htmldocdir=$(docdir)/$(HTML_DIR) ...@@ -179,6 +186,3 @@ htmldocdir=$(docdir)/$(HTML_DIR)
doc_DATA = $(DOC_FILES) doc_DATA = $(DOC_FILES)
htmldoc_DATA = $(HTML_DIR)/*
$(HTML_DIR)/*: $(HTML_DIR)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment