Don't fail if chown or chgrp for 'update-game-score' is unsuccessful.

* lib-src/Makefile.in ($(DESTDIR)${archlibdir}): Don't fail if the
chown or chgrp command is unsuccessful; the 'update-game-score'
program has a fallback for this at runtime.

2 files changed, 14 insertions, 8 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index b67038ff81a..c2aedb0afde 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-22  Ulrich Müller  <ulm@gentoo.org>
+
+        * Makefile.in ($(DESTDIR)${archlibdir}): Don't fail if the chown
+        or chgrp command is unsuccessful; the 'update-game-score' program
+        has a fallback for this at runtime.
+
 2015-01-21  Ulrich Müller  <ulm@gentoo.org>
 
         * update-game-score.c: Allow the program to run sgid instead
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 2997f1b35a8..a0bf5bab580 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -265,15 +265,15 @@ $(DESTDIR)${archlibdir}: all
         touch "$(DESTDIR)${gamedir}/snake-scores"; \
         touch "$(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}"
+        -if chown ${gameuser} "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && chmod u+s,go-r "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; then \
+          chown ${gameuser} "$(DESTDIR)${gamedir}"; \
+          chmod u=rwx,g=rx,o=rx "$(DESTDIR)${gamedir}"; \
+        fi
 else ifneq ($(gamegroup),)
-        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}"
+        -if chgrp ${gamegroup} "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && chmod g+s,o-r "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; then \
+          chgrp ${gamegroup} "$(DESTDIR)${gamedir}"; \
+          chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"; \
+        fi
 endif
         exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
         if [ "$$exp_archlibdir" != "`cd ${srcdir} && /bin/pwd`" ]; then \