From b5cc4a10c0fe365b40be19613777f192a1ada0db Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri, 19 Dec 2008 13:05:32 -0800
Subject: Use XORG_CWARNFLAGS & XORG_CHANGELOG macros from xorg-macros 1.2

---
 Makefile.am | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index f5e9c4e..bb908c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,13 +44,12 @@ nodist_libXfontinclude_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xfont.pc
 
-EXTRA_DIST = xfont.pc.in autogen.sh include/X11/fonts/fontconf.h.in ChangeLog
+EXTRA_DIST = xfont.pc.in autogen.sh include/X11/fonts/fontconf.h.in
 
 .PHONY: ChangeLog
 
-CLEANFILES = 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
 
-- 
cgit v1.2.3