[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 7f4e7dd: Don't fail if chown or chgrp for 'update-g
From: |
Ulrich Müller |
Subject: |
[Emacs-diffs] master 7f4e7dd: Don't fail if chown or chgrp for 'update-game-score' is unsuccessful. |
Date: |
Thu, 22 Jan 2015 07:21:56 +0000 |
branch: master
commit 7f4e7dd378c456b498c270b47b46aaae365a72ab
Author: Ulrich Müller <address@hidden>
Commit: Ulrich Müller <address@hidden>
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.
---
lib-src/ChangeLog | 6 ++++++
lib-src/Makefile.in | 16 ++++++++--------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index b67038f..c2aedb0 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-22 Ulrich Müller <address@hidden>
+
+ * 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 <address@hidden>
* update-game-score.c: Allow the program to run sgid instead
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 2997f1b..a0bf5ba 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 \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 7f4e7dd: Don't fail if chown or chgrp for 'update-game-score' is unsuccessful.,
Ulrich Müller <=