xserver: Branch 'server-1.6-branch' - 2 commits

[Adam Jackson]

 Makefile.am |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 38b0f9edca80e43b4c8c364cfebc25c835d24cbd
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Mar 27 16:49:45 2009 -0400

    Fix distcheck with dolt

diff --git a/Makefile.am b/Makefile.am
index cd22ca1..c605e87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,8 @@ EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh
 
 MAINTAINERCLEANFILES=ChangeLog
 
+DISTCLEANFILES = doltlibtool doltcompile
+
 .PHONY: ChangeLog
 
 ChangeLog:
commit 509986d6f0255588f37446173ea76640895c9886
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Mar 27 16:28:26 2009 -0400

    Fix Changelog generation

diff --git a/Makefile.am b/Makefile.am
index aa9c8b6..cd22ca1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,7 @@ MAINTAINERCLEANFILES=ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
+	(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