From 9725e82f0fa20cc12ab55afb8c94605194ad2fa2 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 10 Oct 2009 19:40:53 -0400 Subject: [PATCH] Add an XORG_INSTALL macro to allow comps to copy the INSTALL file #24206 The Makefile installs INSTALL in share/doc/util-macros An INSTALL_CMD is provided in the new XORG_INSTALL macro which is added to XORG_DEFAULT_OPTIONS. Components add INSTALL target to their Makefile similar to ChangeLog --- Makefile.am | 1 + configure.ac | 2 +- xorg-macros.m4.in | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 265bfd7..49c2d17 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,7 @@ aclocaldir = $(datadir)/aclocal aclocal_DATA = xorg-macros.m4 +dist_doc_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 030dfec..92ad0b4 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.63]) AC_INIT([X.Org Macros], - [1.3.1], + [1.4.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 8875193..59c94d3 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -497,5 +497,21 @@ XORG_CWARNFLAGS XORG_STRICT_OPTION XORG_RELEASE_VERSION XORG_CHANGELOG +XORG_INSTALL XORG_MANPAGE_SECTIONS ]) # XORG_DEFAULT_OPTIONS + +# XORG_INSTALL() +# ---------------- +# Minimum version: 1.4.0 +# +# Defines the variable INSTALL_CMD as the command to copy +# INSTALL from $prefix/share/doc/util-macros. +# +AC_DEFUN([XORG_INSTALL], [ +INSTALL_CMD="if test -f "$prefix/share/doc/util-macros/INSTALL"; then \ +cp -f "$prefix/share/doc/util-macros/INSTALL" \$(top_srcdir); \ +else echo '$prefix/share/doc/util-macros/INSTALL cannot be found.' >&2; fi " +AC_SUBST([INSTALL_CMD]) +]) # XORG_INSTALL + -- 1.6.0.4