From: Walter Doekes <walter+asterisk@wjd.nu>
Date: Sun, 12 Oct 2014 07:50:23 +0000 (+0000)
Subject: build: Relax badshell tilde test to allow for ~ in middle of DESTDIR.
X-Git-Tag: 1.8.32.0-rc1~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53dd56bb54414b7ac02d60b229fc5e69fd8ca1fa;p=thirdparty%2Fasterisk.git

build: Relax badshell tilde test to allow for ~ in middle of DESTDIR.

The main Makefile has a target test called 'badshell' that tests if
DESTDIR does not happen to have an an-expanded tilde (~).  This might
be the case if you run: make install DESTDIR=~/somewhere/

That test also disallowed valid tildes in directory names. The test is
now changed to only trigger on a tilde at the start of the path.

ASTERISK-13797 #close
Reported by: Tzafrir Cohen

Review: https://reviewboard.asterisk.org/r/4064/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@425291 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index 36a8b7e0c5..91b2fb27e1 100644
--- a/Makefile
+++ b/Makefile
@@ -539,7 +539,7 @@ oldmodcheck:
 	fi
 
 badshell:
-ifneq ($(findstring ~,$(DESTDIR)),)
+ifneq ($(filter ~%,$(DESTDIR)),)
 	@echo "Your shell doesn't do ~ expansion when expected (specifically, when doing \"make install DESTDIR=~/path\")."
 	@echo "Try replacing ~ with \$$HOME, as in \"make install DESTDIR=\$$HOME/path\"."
 	@exit 1