Make 'make distcheck' work with automake 1.6.3.

reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index 76aeb622a1d7f24a8b6d4996c9e4fd7ea3df32c2..4af5f5d8ab2a2b1aaeb327f6c7deb712243bd235 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-04  Behdad Esfahbod  <behdad@cs.toronto.edu>
+       reviewed by: plam
+
+       * doc/Makefile.am:
+       * fc-cache/Makefile.am:
+       * fc-cat/Makefile.am: 
+       * fc-list/Makefile.am:
+
+       Make 'make distcheck' work with automake 1.6.3.
+       
 2006-02-03  Takashi IWAI  <tiwai@suse.de>
        reviewed by: plam
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b1a2aee4bb66aae550fd9954ec41a9c9e1866313..10450b1c5cc66597816beee6044967456ca929e4 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -86,7 +86,7 @@ docdir=@DOCDIR@
 DOC_FILES=$(TXT) $(PDF) $(HTML_FILES)
 LOCAL_DOCS=$(man3_MANS) $(man5_MANS) $(DOC_FILES) $(HTML_DIR)/*
 
-EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) $(FNCS_TMPL) confdir.sgml.in
+EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) func.sgml confdir.sgml.in
 
 SUFFIXES=.fncs .sgml .txt .html
 

diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 798506f2680bb4a4f9b655e8f1b87a1b3a6c5912..285f286577c5d68a94b25033ee57400fb67fe2b5 100644 (file)
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -39,7 +39,7 @@ INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
 
 bin_PROGRAMS=fc-cache
 
-EXTRA_DIST=$(SGML)
+EXTRA_DIST=fc-cache.sgml
 
 fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
 

diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
index 55a755e407d1409001403f0626d665663a87f2a3..53c2b7338c9e35cc1266dd419cad6e639458ac94 100644 (file)
--- a/fc-cat/Makefile.am
+++ b/fc-cat/Makefile.am
@@ -33,7 +33,7 @@ INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
 
 bin_PROGRAMS=fc-cat
 
-EXTRA_DIST=$(SGML)
+EXTRA_DIST=fc-cat.sgml
 
 fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la
 

diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
index e16ae4119ed1f38873c546e2a68be2005cc7c3f1..6ad19ba3f5f0df7d3c9aedcbb21c7eb01e8c29c6 100644 (file)
--- a/fc-list/Makefile.am
+++ b/fc-list/Makefile.am
@@ -31,7 +31,7 @@ bin_PROGRAMS=fc-list
 
 INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
 
-EXTRA_DIST=$(SGML)
+EXTRA_DIST=fc-list.sgml
 
 fc_list_LDADD = ${top_builddir}/src/libfontconfig.la