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

Alan Coopersmith Alan.Coopersmith at Sun.COM
Mon Dec 14 08:32:15 PST 2009


Reviewed-by: Alan Coopersmith <alan.coopersmith at sun.com>

Rémi Cardona wrote:
> 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 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

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering



More information about the xorg-devel mailing list