mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

Don’t require chown/chgrp for game installation

Browse source 
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.
This commit is contained in:
Paul Eggert 2017-03-24 10:09:25 -05:00
parent e69a5f5e45
commit 211d41a6fe
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib-src/Makefile.in
View file

@ -266,7 +266,9 @@ need-blessmail: 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}: all
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` && \