From fe38c4d7b57d698de7bb8c4445b1c079386c8c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Cardona?= Date: Thu, 17 Dec 2009 08:34:02 +0100 Subject: Use $(docdir) for damageproto.txt install path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémi Cardona Reviewed-by: Gaetan Nadon Reviewed-by: Alan Coopersmith Reviewed-by: Dan Nicholson --- Makefile.am | 5 ++--- configure.ac | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index cb96a7b..1c35593 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,10 +27,9 @@ damage_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = damageproto.pc -damagedocdir = $(datadir)/doc/$(PACKAGE) -damagedoc_DATA = damageproto.txt +dist_doc_DATA = damageproto.txt -EXTRA_DIST = autogen.sh damageproto.pc.in $(damagedoc_DATA) +EXTRA_DIST = autogen.sh damageproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 443f59b..b0d682b 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([DamageProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -- cgit v1.2.1