>From cbc518a5ece507c4d5214a06a9c1644852da8e74 Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Fri, 24 Mar 2017 10:09:25 -0500
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20require=20chown/chgrp=20for=20g?=
 =?UTF-8?q?ame=20installation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem reported by Joseph Mingrone in:
http://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00622.html
* lib-src/Makefile.in (exp_archlibdir): Don’t fail if chown or
chgrp fails with update-game-score and the game directory.
Instead, expect the installer to fix this up afterwards.
---
 lib-src/Makefile.in | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index b2cd66c..086d0dc 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -266,7 +266,9 @@ need-blessmail:
 maybe-blessmail: $(BLESSMAIL_TARGET)
 
 ## Install the internal utilities.  Until they are installed, we can
-## just run them directly from lib-src.
+## just run them directly from lib-src.  When installing, do not give
+## up if chown or chgrp fails, as the package responsible for
+## installing Emacs can fix this problem later.
 $(DESTDIR)${archlibdir}: all
 	@echo
 	@echo "Installing utilities run internally by Emacs."
@@ -283,15 +285,19 @@ $(DESTDIR)${archlibdir}:
 	touch "$(DESTDIR)${gamedir}/snake-scores" \
 	      "$(DESTDIR)${gamedir}/tetris-scores"
     ifneq (,$(gameuser))
-	chown ${gameuser} "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"
-	chmod u+s,go-r "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"
-	chown ${gameuser} "$(DESTDIR)${gamedir}"
-	chmod u=rwx,g=rx,o=rx "$(DESTDIR)${gamedir}"
+	-chown ${gameuser} \
+	   "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" \
+	   "$(DESTDIR)${gamedir}" && \
+	 chmod u+s,go-r \
+	   "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && \
+	 chmod u=rwx,g=rx,o=rx "$(DESTDIR)${gamedir}"
     else
-	chgrp ${gamegroup} "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"
-	chmod g+s,o-r "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"
-	chgrp ${gamegroup} "$(DESTDIR)${gamedir}"
-	chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"
+	-chgrp ${gamegroup} \
+	   "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && \
+	   "$(DESTDIR)${gamedir}" && \
+	 chmod g+s,o-r \
+	   "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && \
+	 chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"
     endif
   endif
 	exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd` && \
-- 
2.9.3