Attachment 30233 Details for Bug 24278 – [PATCH] ChangeLog: generated file not cleaned from the dist directory

[patch] [PATCH] ChangeLog: generated file not cleaned from the dist directory

0001--ChangeLog-generated-file-not-cleaned-from-the-d.patch (text/plain), 1.89 KB, created by Gaetan Nadon on 2009-10-09 16:32:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gaetan Nadon

Created: 2009-10-09 16:32:18 UTC

Size: 1.89 KB

patch

obsolete

>From 77519a4239d6160c4f022d3f8e700687112814ce Mon Sep 17 00:00:00 2001
>From: Gaetan Nadon <memsize@videotron.ca>
>Date: Fri, 9 Oct 2009 19:25:58 -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 |    6 +++---
> 2 files changed, 4 insertions(+), 4 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..14d579b 100644
>--- a/xorgversion.m4
>+++ b/xorgversion.m4
>@@ -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
>

Actions: View | Splinter Review

Attachments on bug 24278: 30232 | 30233 | 30289

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.