A few fixups for make distcheck

[fontconfig.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3b31bd49d9c1edde44886a5cd4c5c66ea96179e4..7f1605cfa2f7323565c683f989c79369fc9a45ba 100644 (file)
--- 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 $(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,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; \