From 0a0627bd3847297317e9315877df17463adfcafe Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Sun, 8 Nov 2009 23:57:07 +0100 Subject: Silently ignore errors on chmod/chown. --- crawl-ref/source/makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/makefile') diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index e901b3a354..1a37d47967 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -46,6 +46,8 @@ RM = rm -f COPY = cp STRIP = strip WINDRES = windres +CHMOD = chmod 2>/dev/null +CHOWN = chown 2>/dev/null export AR export RANLIB @@ -707,8 +709,8 @@ install: $(GAME) [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix) $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/ $(STRIP) -s $(prefix_fp)/$(bin_prefix)/$(GAME) - chown -R $(INSTALL_UGRP) $(prefix_fp)/$(bin_prefix) - chmod $(MCHMOD) $(prefix_fp)/$(bin_prefix)/$(GAME) + $(CHOWN) -R $(INSTALL_UGRP) $(prefix_fp)/$(bin_prefix) || true + $(CHMOD) $(MCHMOD) $(prefix_fp)/$(bin_prefix)/$(GAME) || true mkdir -p $(datadir_fp)/dat/clua mkdir -p $(datadir_fp)/dat/lua mkdir -p $(datadir_fp)/dat/database @@ -729,12 +731,12 @@ ifdef TILES mkdir -p $(datadir_fp)/dat/tiles $(COPY) dat/tiles/*.png dat/tiles/*.ttf $(prefix_fp)/dat/tiles/ endif - chown -R $(INSTALL_UGRP) $(datadir_fp) + $(CHOWN) -R $(INSTALL_UGRP) $(datadir_fp) || true ifneq ($(SAVEDIR),) mkdir -p $(savedir_fp)/saves mkdir -p $(savedir_fp)/morgue - chown -R $(INSTALL_UGRP) $(savedir_fp) - chmod $(MCHMOD_SAVEDIR) $(savedir_fp) + $(CHOWN) -R $(INSTALL_UGRP) $(savedir_fp) || true + $(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp) || true endif clean: -- cgit v1.2.3-54-g00ecf