X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=Makefile.am;h=7f1605cfa2f7323565c683f989c79369fc9a45ba;hb=89d6119c0283969cb28dc6dfc8eac4cc1b52bf6a;hp=1b28303af735373eaff4457aae1403dcf38aebb8;hpb=822ec78c54a24a0f1589154ac2d4906b02b111ef;p=fontconfig.git

diff --git a/Makefile.am b/Makefile.am
index 1b28303..7f1605c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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,10 +79,10 @@ $(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)
+	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
 	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
 	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
 	  mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \