[asterisk-commits] russell: branch 1.6.0 r114277 - in /branches/1.6.0: ./ Makefile

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Apr 18 14:59:36 2008
New Revision: 114277

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114277
Log:
Merged revisions 114276 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114276 | russell | 2008-04-18 14:59:17 -0500 (Fri, 18 Apr 2008) | 10 lines

Merged revisions 114275 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114275 | russell | 2008-04-18 14:58:55 -0500 (Fri, 18 Apr 2008) | 2 lines

SUBDIRS_INSTALL is already listed as a subtarget for bininstall

........

................

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/Makefile?view=diff&rev=114277&r1=114276&r2=114277
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Fri Apr 18 14:59:36 2008
@@ -571,7 +571,7 @@
 	@exit 1
 endif
 
-install: badshell datafiles bininstall $(SUBDIRS_INSTALL)
+install: badshell datafiles bininstall
 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi