Attachment 20952 Details for Bug 18978 – fix distcheck target

[patch] fix distcheck target

0001-fix-distcheck-target.patch (text/plain), 1.57 KB, created by Peter Breitenlohner on 2008-12-09 03:14:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Breitenlohner

Created: 2008-12-09 03:14:52 UTC

Size: 1.57 KB

patch

obsolete

>From 78d47e1ee6616c884779be725b48cf3e58283388 Mon Sep 17 00:00:00 2001
>From: Peter Breitenlohner <peb@mppmu.mpg.de>
>Date: Mon, 8 Dec 2008 17:40:31 +0100
>Subject: [PATCH] fix distcheck target
>
>Arrange that distcleancheck ignores ChangeLog left over by distclean.
>
>Don't mention ChangeLog under *CLEANFILES, can't be rebuilt from release
>tarball; ChangeLog is automatically distributed, no need to mention it.
>---
> Makefile.am    |    4 ----
> 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
>-- 
>1.6.0.3
>

Actions: View | Splinter Review

Attachments on bug 18978: 20952

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.