build: Don't assume we can set permissions on a directory
authorSimon McVittie <smcv@collabora.com>
Wed, 17 Apr 2019 15:32:01 +0000 (15:32 +0000)
committerSimon McVittie <smcv@collabora.com>
Thu, 18 Apr 2019 15:38:38 +0000 (15:38 +0000)
MSYS2 has enough of a Unixish environment to run Autotools, but
apparently not enough of a Unixish environment to have functional
permissions.

Closes: dbus#216

(cherry picked from commit 14f46d14a0526f137f81a3fff5d32f26733323cd)

test/Makefile.am

index 746ed31..3582932 100644 (file)
@@ -554,8 +554,11 @@ EXTRA_DIST += $(static_data)
 
 ## copy tests to builddir so that generated tests and static tests
 ## are all in one place.
+## Note that we can't create the XDG_RUNTIME_DIR with permissions 0700
+## on MSYS2, which rejects attempts to change permissions, hence "|| true".
 all-local: copy-config-local uninstalled-config-local
-       $(AM_V_at)$(MKDIR_P) -m 700 XDG_RUNTIME_DIR
+       $(AM_V_at)$(MKDIR_P) XDG_RUNTIME_DIR
+       $(AM_V_at)chmod 0700 XDG_RUNTIME_DIR || true
 
 copy-config-local:
        $(AM_V_at)$(MKDIR_P) data/valid-config-files/session.d