(${archlibdir}): Don't conditionalize on

HAVE_SHARED_GAME_DIR. Instead, test at installation time whether or
not we have access to the specified game user.

1 files changed, 10 insertions, 11 deletions

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 6c20b857f64..9a2a1fc401b 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -291,17 +291,16 @@ ${archlibdir}: all
             $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file ${archlibdir}/$$file ; \
           done ; \
         fi
-#ifdef HAVE_SHARED_GAME_DIR
-        chown ${gameuser} ${archlibdir}/update-game-score
-        chmod u+s ${archlibdir}/update-game-score
-        $(top_srcdir)/mkinstalldirs ${gamedir}
-        chown ${gameuser} ${gamedir}
-        chmod u=rwx,g=rwx,o=rx ${gamedir}
-/* If you change these, be sure to change the variables in
-   lisp/play/{tetris,snake}.el. */
-        touch ${gamedir}/snake-scores
-        touch ${gamedir}/tetris-scores
-#endif
+/* If the following commands fail, that is not a big deal.
+   update-game-score will detect at runtime that it is not setuid,
+   and handle things accordingly. */
+        if test ${gamedir} != no && chown ${gameuser} ${archlibdir}/update-game-score && chmod u+s ${archlibdir}/update-game-score; then \
+          $(top_srcdir)/mkinstalldirs ${gamedir}; \
+          chown ${gameuser} ${gamedir}; \
+          chmod u=rwx,g=rwx,o=rx ${gamedir}; \
+          touch ${gamedir}/snake-scores; \
+          touch ${gamedir}/tetris-scores; \
+        fi
         if [ `(cd ${archlibdir} && /bin/pwd)` \
              != `(cd ${srcdir} && /bin/pwd)` ]; then \
           for file in ${SCRIPTS}; do \