diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2014-10-12 07:57:06 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2014-10-12 07:57:06 +0000 |
| commit | c0ac87410648955f7630a850d849c274483b82e4 (patch) | |
| tree | 786d6277ce2871f72b220b67158764ef06cd47d8 /Makefile | |
| parent | 2a03efdbae2ceda40d9bb7e40f4895559d0e5db0 (diff) | |
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
........
Merged revisions 425293 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 425294 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@425295 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -622,7 +622,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 |