Merged revisions 114275 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 18 Apr 2008 19:59:17 +0000 (19:59 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 18 Apr 2008 19:59:17 +0000 (19:59 +0000)
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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114276 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index b0a03d2..ef959dd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -571,7 +571,7 @@ ifneq ($(findstring ~,$(DESTDIR)),)
        @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