Commit 00268a50 authored by Keith Packard's avatar Keith Packard
Browse files

Fix ChangeLog generation to avoid circular make dependency

parent 3ae9258f
...@@ -66,12 +66,9 @@ MAINTAINERCLEANFILES += ChangeLog ...@@ -66,12 +66,9 @@ MAINTAINERCLEANFILES += ChangeLog
EXTRA_DIST += ChangeLog EXTRA_DIST += ChangeLog
ChangeLog: $(srcdir)/ChangeLog ChangeLog:
if test -d "$(srcdir)/.git"; then \
$(srcdir)/ChangeLog: (GIT_DIR=$(top_srcdir)/.git ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
@if test -d "$(srcdir)/.git"; then \
(cd "$(srcdir)" && \
./missing --run git-log --stat) | fmt --split-only > $@.tmp \
&& mv -f $@.tmp $@ \ && mv -f $@.tmp $@ \
|| ($(RM) $@.tmp; \ || ($(RM) $@.tmp; \
echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
...@@ -82,7 +79,7 @@ $(srcdir)/ChangeLog: ...@@ -82,7 +79,7 @@ $(srcdir)/ChangeLog:
echo A git checkout and git-log is required to generate this file >> $@); \ echo A git checkout and git-log is required to generate this file >> $@); \
fi fi
.PHONY: ChangeLog $(srcdir)/ChangeLog .PHONY: ChangeLog
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment