[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Keith Packard]

 Makefile.am     |    2 +-
 src/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3322ca855330631e0d849e6beca0c2d82390898f
Author: Keith Packard <keithp at keithp.com>
Date:   Sat May 3 20:07:35 2008 -0700

    Use of ":=" in src/Makefile.am is unportable (bug 14420)
    
    Building 2.5.91 on Solaris with the native make(1) yields
    
    ...
    Making all in src
    make: Fatal error in reader: Makefile, line 313: Unexpected end of line seen
    Current working directory /tmp/fontconfig-2.5.91/src
    *** Error code 1
    
    This is due to the following line (src/Makefile.am:143):
    
        CLEANFILES := $(ALIAS_FILES)
    
    Changing that to a standard assignment ("=") fixes the problem.
    
    I believe the ":=" is a typo. ALIAS_FILES is just a statically assigned
    variable; it's not like evaluating it more than once would be a problem.

diff --git a/src/Makefile.am b/src/Makefile.am
index c2282af..129d74b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -140,7 +140,7 @@ fcftaliastail.h: fcftalias.h
 fcftalias.h: $(top_srcdir)/src/makealias $(PUBLIC_FT_FILES)
 	sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" fcftalias.h fcftaliastail.h $(PUBLIC_FT_FILES)
 
-CLEANFILES := $(ALIAS_FILES)
+CLEANFILES = $(ALIAS_FILES)
 
 fontconfig.def: $(PUBLIC_FILES)
 	echo Generating $@
commit df8ceebdbe735226bef602614921d517321c690f
Author: Keith Packard <keithp at keithp.com>
Date:   Sat May 3 20:06:48 2008 -0700

    Remove doltcompile in distclean

diff --git a/Makefile.am b/Makefile.am
index 7f1605c..9cd177d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST = \
         fontconfig.spec.in \
         fontconfig.spec \
 	fontconfig-zip.in
-DISTCLEANFILES = config.cache ChangeLog
+DISTCLEANFILES = config.cache ChangeLog doltcompile
 MAINTAINERCLEANFILES = \
 	$(srcdir)/aclocal.m4 \
 	$(srcdir)/autoscan.log \