summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2009-12-17 08:35:10 +0100
committerRémi Cardona <remi@gentoo.org>2009-12-17 08:35:10 +0100
commitef0cad8cf54d1a672983ffac213cdca99fa9151e (patch)
treefc0e6f0dd00954ef9618ade46bf9393787fb0f34
parent8b518027c4243101a7da00b3a9419d63ece1c782 (diff)
Use $(docdir) for fixesproto.txt install path
Signed-off-by: Rémi Cardona <remi@gentoo.org> Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac2
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