[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

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

New commits:
commit 43d0454597dfb5375b1268edb79172779cc51113
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Thu Oct 25 01:26:09 2007 -0700

    Distribute man source files for command line programs (bug 9678).
    
    For systems on whch DOCBOOK is unavailable, distribute command line program
    manual pages in .man format.

diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 26ca40d..3a6ffe1 100644
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -37,14 +37,14 @@ INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
 
 bin_PROGRAMS=fc-cache
 
-EXTRA_DIST=fc-cache.sgml
+man_MANS=fc-cache.1
+
+EXTRA_DIST=fc-cache.sgml $(man_MANS)
 
 fc_cache_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK
 
-man_MANS=fc-cache.1
-
 ${man_MANS}: ${SGML}	
 	$(RM) $@
 	$(DOC2MAN) ${SGML}
diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
index 828f138..2c44de5 100644
--- a/fc-cat/Makefile.am
+++ b/fc-cat/Makefile.am
@@ -31,14 +31,14 @@ INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
 
 bin_PROGRAMS=fc-cat
 
-EXTRA_DIST=fc-cat.sgml
+man_MANS=fc-cat.1
+
+EXTRA_DIST=fc-cat.sgml fc-cat.1
 
 fc_cat_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK
 
-man_MANS=fc-cat.1
-
 ${man_MANS}: ${SGML}	
 	$(RM) $@
 	$(DOC2MAN) ${SGML}
diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
index 88cbf6e..93867b7 100644
--- a/fc-list/Makefile.am
+++ b/fc-list/Makefile.am
@@ -31,14 +31,14 @@ bin_PROGRAMS=fc-list
 
 INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
 
-EXTRA_DIST=fc-list.sgml
+man_MANS=fc-list.1
+
+EXTRA_DIST=fc-list.sgml $(man_MANS)
 
 fc_list_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK
 
-man_MANS=fc-list.1
-
 ${man_MANS}: ${SGML}
 	$(RM) $@
 	$(DOC2MAN) ${SGML}
diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am
index c35ca22..c5e77da 100644
--- a/fc-match/Makefile.am
+++ b/fc-match/Makefile.am
@@ -31,14 +31,14 @@ SGML = ${FC_MATCH_SRC}/fc-match.sgml
 
 INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
 
-EXTRA_DIST=fc-match.sgml
+man_MANS=fc-match.1
+
+EXTRA_DIST=fc-match.sgml $(man_MANS)
 
 fc_match_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK
 
-man_MANS=fc-match.1
-
 ${man_MANS}: ${SGML}
 	$(RM) $@
 	$(DOC2MAN) ${SGML}