proto/randrproto: Branch 'master'

[Remi Cardona]

 Makefile.am  |    5 ++---
 configure.ac |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 68f8fbe50792e0525ba767d854b18db4acda07ff
Author: Rémi Cardona <remi at gentoo.org>
Date:   Thu Dec 17 08:36:49 2009 +0100

    Use $(docdir) for randrproto.txt install path
    
    Signed-off-by: Rémi Cardona <remi at gentoo.org>
    Reviewed-by: Gaetan Nadon <memsize at videotron.ca>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at sun.com>
    Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>

diff --git a/Makefile.am b/Makefile.am
index e4bf141..5a1ce11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,10 +6,9 @@ randr_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = randrproto.pc
 
-randrdocdir = $(datadir)/doc/$(PACKAGE)
-randrdoc_DATA = randrproto.txt
+dist_doc_DATA = randrproto.txt
 
-EXTRA_DIST = randrproto.pc.in $(randrdoc_DATA)
+EXTRA_DIST = randrproto.pc.in
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index ec7812f..e876c44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl  PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl Process this file with autoconf to create configure.
 
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
 AC_INIT([RandrProto], [1.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE