[Fontconfig] fontconfig: Branch 'master'

[Eric Anholt]

 fc-cache/Makefile.am |    8 ++++++--
 fc-cat/Makefile.am   |    8 ++++++--
 fc-list/Makefile.am  |    8 ++++++--
 fc-match/Makefile.am |    8 ++++++--
 4 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit ba884599133e444b5f6d0b9b6981079cf8059b9f
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Apr 18 11:52:41 2008 -0700

    Fix build with !ENABLE_DOCS and no built manpages.

diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index b2be6bc..2c86a77 100644
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -40,9 +40,13 @@ INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
 
 bin_PROGRAMS=fc-cache
 
-man_MANS=fc-cache.1
+BUILT_MANS=fc-cache.1
 
-EXTRA_DIST=fc-cache.sgml $(man_MANS)
+if ENABLE_DOCS
+man_MANS=${BUILT_MANS}
+endif
+
+EXTRA_DIST=fc-cache.sgml $(BUILT_MANS)
 
 fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
 
diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
index 245a75c..62f983c 100644
--- a/fc-cat/Makefile.am
+++ b/fc-cat/Makefile.am
@@ -31,9 +31,13 @@ INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
 
 bin_PROGRAMS=fc-cat
 
-man_MANS=fc-cat.1
+BUILT_MANS=fc-cat.1
 
-EXTRA_DIST=fc-cat.sgml fc-cat.1
+if ENABLE_DOCS
+man_MANS=${BUILT_MANS}
+endif
+
+EXTRA_DIST=fc-cat.sgml ${BUILT_MANS}
 
 fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la
 
diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
index dc9f410..fcbb326 100644
--- a/fc-list/Makefile.am
+++ b/fc-list/Makefile.am
@@ -31,9 +31,13 @@ bin_PROGRAMS=fc-list
 
 INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
 
-man_MANS=fc-list.1
+BUILT_MANS=fc-list.1
 
-EXTRA_DIST=fc-list.sgml $(man_MANS)
+if ENABLE_DOCS
+man_MANS=${BUILT_MANS}
+endif
+
+EXTRA_DIST=fc-list.sgml $(BUILT_MANS)
 
 fc_list_LDADD = ${top_builddir}/src/libfontconfig.la
 
diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am
index 60e8649..ca5ca39 100644
--- a/fc-match/Makefile.am
+++ b/fc-match/Makefile.am
@@ -31,9 +31,13 @@ SGML = ${FC_MATCH_SRC}/fc-match.sgml
 
 INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
 
-man_MANS=fc-match.1
+BUILT_MANS=fc-match.1
 
-EXTRA_DIST=fc-match.sgml $(man_MANS)
+if ENABLE_DOCS
+man_MANS=${BUILT_MANS}
+endif
+
+EXTRA_DIST=fc-match.sgml $(BUILT_MANS)
 
 fc_match_LDADD = ${top_builddir}/src/libfontconfig.la