From c702219607f267da543a8db42ca0d03b88b78183 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 7 May 2013 18:11:37 +0200 Subject: [PATCH] Relax check for "~" sign in DESTDIR to not fail with unreleased builds Using git-buildpackage for continuous integration we have something like: | /usr/bin/make DESTDIR=/tmp/buildd/ngcp-asterisk-1.4.24.1+ngcp.1+0~1367942255.82+squeeze~1.gbp58b891/debian/ngcp-asterisk/ install in some of our build processes. To avoid failing at this stage modify the check in the "badshell" make target to check for "~/" instead of just checking for "~" anywhere inside the version string. Also see: https://issues.asterisk.org/jira/browse/ASTERISK-13797 Closes: https://jenkins.mgm.sipwise.com/job/asterisk-binaries/78/ --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9ff8730..7e4327b 100644 --- a/Makefile +++ b/Makefile @@ -507,7 +507,7 @@ oldmodcheck: fi badshell: -ifneq ($(findstring ~,$(DESTDIR)),) +ifneq ($(findstring ~/,$(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