From 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 16 May 2010 20:50:58 +0000
Subject: svn merge -r588:HEAD ^/branches/released .

---
 X11/Makefile.am | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'X11/Makefile.am')

diff --git a/X11/Makefile.am b/X11/Makefile.am
index 96c6b2604..26b99954a 100644
--- a/X11/Makefile.am
+++ b/X11/Makefile.am
@@ -32,14 +32,16 @@ nodist_xproto_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xproto.pc
 
-EXTRA_DIST = xproto.pc.in ChangeLog
 
-CLEANFILES=ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL
 
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
 
 ChangeLog:
 	$(CHANGELOG_CMD)
 
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
 
-- 
cgit v1.2.3