summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-12-11 12:54:03 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-12-11 13:53:22 -0800
commit52c17bfbe2a50c9117ad92843f34e94be4f09c5e (patch)
treeabb0bf2f048da938808f580cefc6923e4d8550b6
parentc53bfd6679f842a5a061904740d86932bbbda6c6 (diff)
Bug 25592: Use $(docdir) for XvMC_API.txt install path
Bumps minimum autoconf version required to 2.60 for $(docdir) Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index eaf85d1..84de33c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,7 @@ SUBDIRS = src include
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xvmc.pc
-xvmcdocdir = $(datadir)/doc/$(PACKAGE)
-dist_xvmcdoc_DATA = XvMC_API.txt
+dist_doc_DATA = XvMC_API.txt
MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xvmc.pc.in
diff --git a/configure.ac b/configure.ac
index 1a029a8..daa6f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,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(libXvMC, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXvMC)
AM_INIT_AUTOMAKE([foreign dist-bzip2])