diff options
| author | Rémi Cardona <remi@gentoo.org> | 2009-12-17 08:32:20 +0100 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2009-12-17 08:32:20 +0100 |
| commit | fdf8d73a27cd0cadae5a14e7a88870121ae113aa (patch) | |
| tree | a343189d4265ccce5f16961d1aabdc4ed90fb8a9 | |
| parent | 5ecb066e04595d300a0faad0f95c859a709ff857 (diff) | |
Use $(docdir) for compositeproto.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.am | 5 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 1e95976..11d4e80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,10 +29,9 @@ composite_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = compositeproto.pc -compositedocdir = $(datadir)/doc/$(PACKAGE) -compositedoc_DATA = compositeproto.txt +dist_doc_DATA = compositeproto.txt -EXTRA_DIST = autogen.sh compositeproto.pc.in $(compositedoc_DATA) +EXTRA_DIST = autogen.sh compositeproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 1d3750e..26182d6 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,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([CompositeProto], [0.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE |