From 578938f1cdd5a06dd6fa28167d575ec980322a5d Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 16 Nov 2009 13:46:01 +0000
Subject: Update to git master branch of xserver.

---
 xorg-server/Makefile.am | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'xorg-server/Makefile.am')

diff --git a/xorg-server/Makefile.am b/xorg-server/Makefile.am
index a5e07307c..667c0de72 100644
--- a/xorg-server/Makefile.am
+++ b/xorg-server/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS=dist-bzip2 foreign nostdinc
+AUTOMAKE_OPTIONS=nostdinc
 ACLOCAL_AMFLAGS = -I m4
 
 if COMPOSITE
@@ -49,7 +49,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-server.pc
 endif
 
-EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh
+EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh
 
 DISTCHECK_CONFIGURE_FLAGS=\
 	--with-xkb-path=$(XKB_BASE_DIRECTORY) \
@@ -57,14 +57,16 @@ DISTCHECK_CONFIGURE_FLAGS=\
 	--with-xkb-output='$${datadir}/X11/xkb/compiled'
 
 DISTCLEANFILES = doltcompile doltlibtool
-MAINTAINERCLEANFILES=ChangeLog
 
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
 
 ChangeLog:
 	$(CHANGELOG_CMD)
 
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
 
 DIST_SUBDIRS = \
 	doc \
-- 
cgit v1.2.3