[PATCH] INSTALL doesn't belong in docdir
Gaetan Nadon
memsize at videotron.ca
Sat Jan 2 07:34:54 PST 2010
On Sat, 2010-01-02 at 11:06 +0000, Julien Cristau wrote:
> docdir stays in xorg-macros.pc so we don't break the existing
> $(INSTALL_CMD).
> ---
> Something like this should move INSTALL to a more appropriate location.
I agree the new location is more appropriate.
>
> Makefile.am | 2 +-
> configure.ac | 2 +-
> xorg-macros.m4.in | 10 +++++-----
> xorg-macros.pc.in | 5 +++--
> 4 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 1e07014..7340beb 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -21,7 +21,7 @@
>
> aclocaldir = $(datadir)/aclocal
> aclocal_DATA = xorg-macros.m4
> -dist_doc_DATA = INSTALL
> +dist_pkgdata_DATA = INSTALL
>
> # Previous versions used to install xorgversion.m4, now integrated
> # into xorg-macros.m4. Explicitly remove that old file in order not
> diff --git a/configure.ac b/configure.ac
> index 99c8996..ad244ba 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
>
> AC_PREREQ([2.60])
> AC_INIT([util-macros],
> - [1.4.1],
> + [1.5.0],
> [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
> [util-macros])
> AC_CONFIG_SRCDIR([Makefile.am])
> diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
> index 20d0c70..9d70ac6 100644
> --- a/xorg-macros.m4.in
> +++ b/xorg-macros.m4.in
> @@ -504,17 +504,17 @@ XORG_MANPAGE_SECTIONS
>
> # XORG_INSTALL()
> # ----------------
> -# Minimum version: 1.4.0
> +# Minimum version: 1.5.0
> #
> # Defines the variable INSTALL_CMD as the command to copy
> -# INSTALL from $prefix/share/doc/util-macros.
> +# INSTALL from $prefix/share/util-macros.
> #
> AC_DEFUN([XORG_INSTALL], [
> AC_REQUIRE([PKG_PROG_PKG_CONFIG])
> -macros_docdir=`$PKG_CONFIG --print-errors --variable=docdir xorg-macros`
> -INSTALL_CMD="(cp -f "$macros_docdir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
> +macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdata xorg-macros`
-------------------------------------------------------------------------------------------------> pkgdatadir perhaps?
> +INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
> mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
> || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
> -echo 'util-macros \"docdir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
> +echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
> AC_SUBST([INSTALL_CMD])
> ]) # XORG_INSTALL
> diff --git a/xorg-macros.pc.in b/xorg-macros.pc.in
> index 15a1154..d3f7408 100644
> --- a/xorg-macros.pc.in
> +++ b/xorg-macros.pc.in
> @@ -3,9 +3,10 @@ exec_prefix=@exec_prefix@
> includedir=@includedir@
> datarootdir=@datarootdir@
> datadir=@datadir@
> -PACKAGE_TARNAME=@PACKAGE_TARNAME@
> +PACKAGE=@PACKAGE@
> # Used by XORG_INSTALL
> -docdir=@docdir@
> +pkgdatadir=${datadir}/${PACKAGE}
> +docdir=${pkgdatadir}
docdir: a comment about backward compatibility would be useful for
other people a couple of years down the road.
>
> Name: X.Org Macros
> Description: A set of autoconf project macros for X.Org modules
I'll wait for your reply and give it a good test.
Regards,
Gaetan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.x.org/archives/xorg-devel/attachments/20100102/7ac4f982/attachment.html
More information about the xorg-devel
mailing list