From 1c43c1893aceac8a9edf593164036cb45df3b34e Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 9 Oct 2009 16:35:38 -0400 Subject: [PATCH] ChangeLog: generated file not cleaned from the dist directory #24278 CHANGELOG_CMD was writting 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 Updated AC_INIT version to 1.3.1 --- configure.ac | 2 +- xorgversion.m4 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index abc6f46..b6caa73 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) AC_INIT([util-macros], - [1.3.0], + [1.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff --git a/xorgversion.m4 b/xorgversion.m4 index 761af3d..7b0b8e1 100644 --- a/xorgversion.m4 +++ b/xorgversion.m4 @@ -62,7 +62,7 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ # XORG_CHANGELOG() # ---------------- -# Minimum version: 1.2.0 +# Minimum version: 1.3.1 # # Defines the variable CHANGELOG_CMD as the command to generate # ChangeLog from git. @@ -70,9 +70,9 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ # 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