macros: Changes to 'master'

[Peter Hutterer]

 xorg-macros.m4.in |    5 +++--
 xorgversion.m4    |    7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 39f07f7db58ebbf3dcb64a2bf9098ed5cf3d1223
Author: Emil Velikov <emil.veliko at collabora.com>
Date:   Tue Feb 14 11:38:21 2017 +0000

    Rework INSTALL_CMD to touch/echo >&2 only as needed
    
    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>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 4fc573e2f3cbbed7baa5e05fb798c2e4f4236f7d
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue Feb 14 11:38:20 2017 +0000

    Rework CHANGELOG_CMD to touch/echo >&2 only as needed
    
    Currently CHANGELOG_CMD issues a
    
      touch ChangeLog; echo "Scary message" >&2
    
    even if the file is already present. For example, when running `make
    distcheck' the following is observed:
    
    "
    /bin/sh: ../../.changelog.tmp: Permission denied
    git directory not found: installing possibly empty changelog.
    ...
    /bin/sh: ../../.changelog.tmp: Permission denied
    git directory not found: installing possibly empty changelog.
    "
    
    That in itself happens since srcdir is RO, thus shell redirection [to
    srcddir/.changelog.tmp] fails. At the same time the latter message is
    wrong and misleading since the file is already there, with the correct
    contents.
    
    Silence the permissing warning (/dev/null is our friend), and add
    a simple `test -e .../ChangeLog || (...' prior to the touch/echo combo.
    
    As we're here also update the message to be more generic, since there
    are multiple other reasons why things can fail.
    
    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>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>