diff options
| author | Julien Cristau <jcristau@debian.org> | 2010-01-02 20:44:37 +0000 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-01-09 09:06:33 -0500 |
| commit | 43e41a5537ba892613f2a9f79cdf209fd7c915b3 (patch) | |
| tree | ac599b5c49a5cd9dfb9a4a98d7a1e35388942bd8 | |
| parent | 29f4c09cc252d834278e6e1ad77ad56dc0545d29 (diff) | |
INSTALL doesn't belong in docdir, use pkgdatadir instead
docdir stays in xorg-macros.pc so we don't break the existing
$(INSTALL_CMD).
Tested-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | xorg-macros.m4.in | 8 | ||||
| -rw-r--r-- | xorg-macros.pc.in | 7 |
3 files changed, 10 insertions, 7 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/xorg-macros.m4.in b/xorg-macros.m4.in index 20d0c70..db2a62d 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -507,14 +507,14 @@ XORG_MANPAGE_SECTIONS # Minimum version: 1.4.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=pkgdatadir xorg-macros` +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..dcc1e4b 100644 --- a/xorg-macros.pc.in +++ b/xorg-macros.pc.in @@ -3,9 +3,12 @@ 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 is kept for backwards compatibility with XORG_INSTALL from +# util-macros 1.4 +docdir=${pkgdatadir} Name: X.Org Macros Description: A set of autoconf project macros for X.Org modules |