From f8695cf7b892028bf7c502e85f26f0a756edd316 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 12 Oct 2009 10:37:36 -0400 Subject: [PATCH] ChangeLog: generated file not cleaned from the dist directory #24278 CHANGELOG_CMD was written in the wrong directory. Update cmd to generate in $(top_srcdir) Tested in regular build with git: dist, distcheck and distclean Tested in VPATH build with git: dist, distcheck and distclean Tested above scenario from tarballs with git not available --- xorgversion.m4 | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xorgversion.m4 b/xorgversion.m4 index 761af3d..ff4f796 100644 --- a/xorgversion.m4 +++ b/xorgversion.m4 @@ -67,12 +67,11 @@ 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; \ +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ +|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/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 -- 1.6.0.4