[PATCH util/macros 2/2] Rework INSTALL_CMD to touch/echo >&2 only as needed

[Peter Hutterer]

On Tue, Feb 14, 2017 at 11:38:21AM +0000, Emil Velikov wrote:
> From: Emil Velikov <emil.veliko at collabora.com>
> 
> Analogous to previous commit.
> 
> With this commit we no longer get the following erroneous messages
> during `make distcheck'.
> 
> "
> failed to copy INSTALL from util-macros: installing possibly empty INSTALL.
> ...
> failed to copy INSTALL from util-macros: installing possibly empty INSTALL.
> "
> 
> Cc: Gaetan Nadon <memsize at videotron.ca>
> Cc: Peter Hutterer <peter.hutterer at who-t.net>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---


remote: I: patch #138806 updated using rev 4fc573e2f3cbbed7baa5e05fb798c2e4f4236f7d.
remote: I: patch #138805 updated using rev 39f07f7db58ebbf3dcb64a2bf9098ed5cf3d1223.
remote: I: 2 patch(es) updated to state Accepted.
To git+ssh://git.freedesktop.org/git/xorg/util/macros
   4b6b1df..39f07f7  master -> master


Cheers,
   Peter

>  xorg-macros.m4.in | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
> index 2ed7837..7935426 100644
> --- a/xorg-macros.m4.in
> +++ b/xorg-macros.m4.in
> @@ -1839,7 +1839,8 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
>  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 \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
> +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
> +touch \$(top_srcdir)/INSTALL; \
> +echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
>  AC_SUBST([INSTALL_CMD])
>  ]) # XORG_INSTALL
> -- 
> 2.11.0
>