[svn-commits] coreyfarrell: trunk r426834 - in /trunk: ./ Makefile contrib/Makefile

[SVN commits to the Digium repositories]

Author: coreyfarrell
Date: Thu Oct 30 22:09:48 2014
New Revision: 426834

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=426834
Log:
REF_DEBUG: Install refcounter.py to $(ASTDATADIR)/scripts

This change ensures refcounter.py is installed to a place where it
can be found by the Asterisk testsuite if REF_DEBUG is enabled.

ASTERISK-24432 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4094/
........

Merged revisions 426830 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 426831 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 426832 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 426833 from http://svn.asterisk.org/svn/asterisk/branches/13

Added:
    trunk/contrib/Makefile
      - copied unchanged from r426833, branches/13/contrib/Makefile
Modified:
    trunk/   (props changed)
    trunk/Makefile

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

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=426834&r1=426833&r2=426834
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Oct 30 22:09:48 2014
@@ -241,7 +241,7 @@
 _ASTCFLAGS+=$(OPTIONS)
 
 MOD_SUBDIRS:=channels pbx apps codecs formats cdr cel bridges funcs tests main res addons $(LOCAL_MOD_SUBDIRS)
-OTHER_SUBDIRS:=utils agi
+OTHER_SUBDIRS:=utils agi contrib
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)