xf86-video-ati: Branch 'master' - 2 commits

[Daniel Stone]

 Makefile.am |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

New commits:
diff-tree 59c5b4f69c97fb233144677ab18095f88aed006b (from 7611f14dc697b75cd7bb6493bb65b3a7ead379b8)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed Dec 6 18:48:55 2006 +0200

    Makefile.am: re-add ChangeLog to CLEANFILES

diff --git a/Makefile.am b/Makefile.am
index a3a34af..2ae4852 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,7 @@ README.r128: README.r128.sgml
 endif
 
 EXTRA_DIST = README.ati README.r128 README.ati.sgml README.r128.sgml 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)
diff-tree 7611f14dc697b75cd7bb6493bb65b3a7ead379b8 (from f2a9d2d61addc4e3d5e128d8078a04c9a136be6a)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed Dec 6 18:47:33 2006 +0200

    Makefile.am: fix changelog hook
    Make changelog hook safe for all situations.

diff --git a/Makefile.am b/Makefile.am
index c51060a..a3a34af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,9 +32,7 @@ endif
 
 EXTRA_DIST = README.ati README.r128 README.ati.sgml README.r128.sgml ChangeLog
 
-# Always regenerate the changelog
-CLEANFILES = ChangeLog
-ChangeLog: FORCE
-	git-log > ChangeLog
-FORCE:
+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)
 
+dist-hook: ChangeLog