X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=Makefile.am;h=7f1605cfa2f7323565c683f989c79369fc9a45ba;hb=37e9d33950df03f76b6938ae5675ecfc853eb903;hp=1ebb86978c031dd935ce677a9726e4588a2aa35b;hpb=766a9b2f61458202be0fbf5745ce1e02ecd95c6e;p=fontconfig.git

diff --git a/Makefile.am b/Makefile.am
index 1ebb869..7f1605c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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.avail conf.d $(DOCSRC) test
+	fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
 	 
 EXTRA_DIST = \
         fontconfig.pc.in \
@@ -32,7 +32,7 @@ EXTRA_DIST = \
         fontconfig.spec.in \
         fontconfig.spec \
 	fontconfig-zip.in
-DISTCLEANFILES = config.cache
+DISTCLEANFILES = config.cache ChangeLog
 MAINTAINERCLEANFILES = \
 	$(srcdir)/aclocal.m4 \
 	$(srcdir)/autoscan.log \
@@ -66,12 +66,9 @@ MAINTAINERCLEANFILES += ChangeLog
 
 EXTRA_DIST += ChangeLog
 
-ChangeLog: $(srcdir)/ChangeLog
-
-$(srcdir)/ChangeLog:
-	@if test -d "$(srcdir)/.git"; then \
-	  (cd "$(srcdir)" && \
-	  ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
+ChangeLog:
+	if test -d "$(srcdir)/.git"; then \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
 	  && mv -f $@.tmp $@ \
 	  || ($(RM) $@.tmp; \
 	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
@@ -82,7 +79,7 @@ $(srcdir)/ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi
 
-.PHONY: ChangeLog $(srcdir)/ChangeLog
+.PHONY: ChangeLog
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
@@ -97,7 +94,7 @@ install-data-local:
 	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
 	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
 	fi; fi
-	(if $(RUN_FC_CACHE_TEST); then \
+	@(if $(RUN_FC_CACHE_TEST); then \
 	    echo " fc-cache/fc-cache -s -f -v"; \
 	    fc-cache/fc-cache -s -f -v; \
 	else \