Attachment 27516 Details for Bug 22611 – [PATCH] sun-misc: use XORG_CHANGELOG macro to create ChangeLog. #22611

[PATCH] sun-misc: use XORG_CHANGELOG macro to create ChangeLog. #22611

0001-sun-misc-use-XORG_CHANGELOG-macro-to-create-ChangeL.patch (text/plain), 1.67 KB, created by Gaetan Nadon on 2009-07-09 06:17:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gaetan Nadon

Created: 2009-07-09 06:17:27 UTC

Size: 1.67 KB

patch

obsolete

>From 9d29b7d0251167a884f76cdca1bfc32eeefad22a Mon Sep 17 00:00:00 2001
>From: Gaetan Nadon <memsize@videotron.ca>
>Date: Wed, 8 Jul 2009 10:46:21 -0400
>Subject: [PATCH] sun-misc: use XORG_CHANGELOG macro to create ChangeLog. #22611
> Build break: Makefile.am: command not found: git-log
>
>Adding the macro in configure.ac and use it in Makefile.am
>Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
>Tested: running autogen.sh, make and 'make dist'
>
>Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
>---
> Makefile.am  |    2 +-
> configure.ac |    5 +++++
> 2 files changed, 6 insertions(+), 1 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index a2db066..12b622b 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -56,6 +56,6 @@ MAINTAINERCLEANFILES = ChangeLog
> .PHONY: ChangeLog
> 
> ChangeLog:
>-	(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)
>+	$(CHANGELOG_CMD)
> 
> dist-hook: ChangeLog
>diff --git a/configure.ac b/configure.ac
>index ae79149..70a388e 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -26,6 +26,10 @@ AC_INIT(font-sun-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?prod
> AM_INIT_AUTOMAKE([foreign dist-bzip2])
> AM_MAINTAINER_MODE
> 
>+# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG
>+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
>+XORG_MACROS_VERSION(1.2)
>+
> AC_PROG_INSTALL
> 
> AC_PATH_PROG(BDFTOPCF, bdftopcf)
>@@ -48,5 +52,6 @@ AC_ARG_WITH(fontdir,
> AC_SUBST(FONTDIR)
> 
> XORG_RELEASE_VERSION
>+XORG_CHANGELOG
> 
> AC_OUTPUT([Makefile])
>-- 
>1.6.0.4
>

Actions: View

Attachments on bug 22611: 27504 | 27505 | 27507 | 27513 | 27514 | 27515 | 27516 | 27520 | 27523 | 27524 | 27531 | 27532 | 27533 | 27534 | 27535 | 27729 | 27730 | 27731 | 27732

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.