[svn-commits] qwell: trunk r104140 - in /trunk: ./ Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Feb 26 12:10:20 2008
New Revision: 104140

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104140
Log:
Merged revisions 104139 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r104139 | qwell | 2008-02-26 12:09:13 -0600 (Tue, 26 Feb 2008) | 2 lines

Since all shells aren't as awesome as bash, we have to fail if somebody tries to use a literal "~" in DESTDIR.

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=104140&r1=104139&r2=104140
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Feb 26 12:10:20 2008
@@ -558,7 +558,14 @@
 		echo " WARNING WARNING WARNING" ;\
 	fi
 
-install: datafiles bininstall $(SUBDIRS_INSTALL)
+badshell:
+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
+endif
+
+install: badshell datafiles bininstall $(SUBDIRS_INSTALL)
 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi