diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | xorgversion.m4 | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 112c7c6..265bfd7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,13 +28,9 @@ aclocal_DATA = xorg-macros.m4 install-data-hook: rm -f $(DESTDIR)$(aclocaldir)/xorgversion.m4 -EXTRA_DIST = ChangeLog - .PHONY: ChangeLog ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog - -DISTCLEANFILES = ChangeLog diff --git a/xorgversion.m4 b/xorgversion.m4 index edfc0fb..881955d 100644 --- a/xorgversion.m4 +++ b/xorgversion.m4 @@ -67,9 +67,12 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ # Defines the variable CHANGELOG_CMD as the command to generate # ChangeLog from git. # +# Arrange that distcleancheck ignores ChangeLog left over by distclean. +# AC_DEFUN([XORG_CHANGELOG], [ CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ echo 'git directory not found: installing possibly empty changelog.' >&2)" AC_SUBST([CHANGELOG_CMD]) +AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print']) ]) # XORG_CHANGELOG |