[svn-commits] dlee: trunk r372874 - in /trunk: ./ Makefile

[SVN commits to the Digium repositories]

Author: dlee
Date: Tue Sep 11 13:09:22 2012
New Revision: 372874

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372874
Log:
Corrects the astsbindir setting when installing the sample asterisk.conf.

(closes issue ASTERISK-20406)
........

Merged revisions 372863 from http://svn.asterisk.org/svn/asterisk/branches/10
........

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

Modified:
    trunk/   (props changed)
    trunk/Makefile

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

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=372874&r1=372873&r2=372874
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Sep 11 13:09:22 2012
@@ -690,6 +690,7 @@
 			-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
 			-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
 			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
+			-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
 			"$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
 		$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
 		rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \