[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

 conf.d/Makefile.am |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6e5d2cb931f11f0aba8d187e49ddc7cc92a5be85
Author: Keith Packard <keithp at keithp.com>
Date:   Sun Nov 25 16:35:55 2007 -0800

    Move conf.avail/README to conf.d/README (bug 13392)
    
    Because conf.d is where most people look first.  And the comment at the top
    of the README file says conf.d/README too.

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 7aca246..16d4b35 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -21,8 +21,10 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+DOC_FILES= \
+	README
+
 CONF_FILES = \
-	README \
 	10-autohint.conf \
 	10-no-sub-pixel.conf \
 	10-sub-pixel-bgr.conf \
@@ -66,13 +68,14 @@ CONF_LINKS = \
 	80-delicious.conf \
 	90-synthetic.conf
 
-EXTRA_DIST = $(CONF_FILES)
+EXTRA_DIST = $(CONF_FILES) $(DOC_FILES)
 
 configdir=$(CONFDIR)
 confavaildir=$(configdir)/conf.avail
 confddir=$(configdir)/conf.d
 
 confavail_DATA=$(CONF_FILES)
+confd_DATA=$(DOC_FILES)
 
 install-data-local:
 	mkdir -p ${DESTDIR}${confddir}