[PATCH:fixesproto] Use $(docdir) for fixesproto.txt install path

Rémi Cardona remi at gentoo.org
Sat Dec 12 01:59:14 PST 2009


Signed-off-by: Rémi Cardona <remi at gentoo.org>
---
 Makefile.am  |    5 ++---
 configure.ac |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 91588f8..25f0fff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,13 +24,12 @@ fixes_HEADERS = \
 	xfixesproto.h \
 	xfixeswire.h
 
-fixesdocdir = $(datadir)/doc/$(PACKAGE)
-fixesdoc_DATA = fixesproto.txt
+dist_doc_DATA = fixesproto.txt
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = fixesproto.pc
 
-EXTRA_DIST = fixesproto.pc.in $(fixesdoc_DATA)
+EXTRA_DIST = fixesproto.pc.in
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index 1cdff7e..04a9feb 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([FixesProto], [4.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
-- 
1.6.5.5



More information about the xorg-devel mailing list