X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=Makefile.am;h=ec7a5d9a7aae43f59ebf9a05d37b81988a90a4d6;hb=0eaed16d34687bddc831d1ab3c50406c7c56792d;hp=9cd177da05c3f866ea08edb8a779aa9eb93f4b28;hpb=df8ceebdbe735226bef602614921d517321c690f;p=fontconfig.git

diff --git a/Makefile.am b/Makefile.am
index 9cd177d..ec7a5d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id$
+#  fontconfig/Makefile.am
 # 
 #  Copyright © 2003 Keith Packard
 # 
@@ -23,7 +23,7 @@
 
 DOCSRC=@DOCSRC@
 SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
-	fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
+	fc-cache fc-cat fc-list fc-match fc-query fc-scan conf.d $(DOCSRC) test
 	 
 EXTRA_DIST = \
         fontconfig.pc.in \
@@ -32,6 +32,7 @@ EXTRA_DIST = \
         fontconfig.spec.in \
         fontconfig.spec \
 	fontconfig-zip.in
+CLEANFILES = fonts.conf
 DISTCLEANFILES = config.cache ChangeLog doltcompile
 MAINTAINERCLEANFILES = \
 	$(srcdir)/aclocal.m4 \
@@ -81,7 +82,17 @@ ChangeLog:
 
 .PHONY: ChangeLog
 
-install-data-local:
+fonts.conf: fonts.conf.in Makefile
+	sed \
+		-e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \
+		-e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \
+		-e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \
+		-e 's,@PACKAGE\@,$(PACKAGE),g' \
+		-e 's,@VERSION\@,$(VERSION),g' \
+		$< > $@.tmp && \
+	mv $@.tmp $@
+
+install-data-local: fonts.conf
 	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
 	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
 	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
@@ -95,8 +106,8 @@ install-data-local:
 	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
 	fi; fi
 	@(if $(RUN_FC_CACHE_TEST); then \
-	    echo " fc-cache/fc-cache -s -f -v"; \
-	    fc-cache/fc-cache -s -f -v; \
+	    echo " $(bindir)/fc-cache -s -f -v"; \
+	    $(bindir)/fc-cache -s -f -v; \
 	else \
 	    echo "***"; \
 	    echo "*** Warning: fonts.cache not built"; \