[asterisk-commits] wdoekes: branch 12 r425293 - in /branches/12: ./ Makefile

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Sun Oct 12 02:52:58 2014
New Revision: 425293

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425293
Log:
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/
........

Merged revisions 425291 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 425292 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/Makefile

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/12/Makefile?view=diff&rev=425293&r1=425292&r2=425293
==============================================================================
--- branches/12/Makefile (original)
+++ branches/12/Makefile Sun Oct 12 02:52:58 2014
@@ -617,7 +617,7 @@
 	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