X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=Makefile.am;h=e0539023a452cfa3d2faf0a76d2b2cdf9edade51;hb=e66c65fd41928babb3ba2ae2dc58f13d25e57661;hp=24229fbf44706abba08163ba9c851d3d149641a5;hpb=88b6bebc3d648464ad9bcb7f106694ed85a84460;p=fontconfig.git

diff --git a/Makefile.am b/Makefile.am
index 24229fb..e053902 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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; \
@@ -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 \