[PATCH util/macros 2/2] Use mv -f in the INSTALL_CMD rule

Emil Velikov emil.l.velikov at gmail.com
Thu Jan 26 17:53:20 UTC 2017


From: Emil Velikov <emil.velikov at collabora.com>

Otherwise we'll get a lovely warning about permissions mismatch.

Not 100% sure if this is the correct thing, but everything seems to work
as expected and the files in the generated tarball have the correct
permissions.

Cc: Peter Hutterer <peter.hutterer at who-t.net>
Cc: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
Gents can you please test/take a look at these ?

With these in place the git worktree approach for release.sh works like
a charm over here - dry-run tested on libdrm, mesa and libXi.

Before we merge that one we'll need to make a xorg-util-macros release
and bump the required version.
---
 xorg-macros.m4.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index 675d07d..423b471 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -1838,7 +1838,7 @@ AC_DEFUN([XORG_INSTALL], [
 AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_builddir)/.INSTALL.tmp && \
-mv \$(top_builddir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
+mv -f \$(top_builddir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
 || (rm -f \$(top_builddir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
 echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
 AC_SUBST([INSTALL_CMD])
-- 
2.11.0



More information about the xorg-devel mailing list