From: Automerge script <automerge@asterisk.org>
Date: Tue, 11 Sep 2012 17:19:08 +0000 (+0000)
Subject: Merged revisions 372863 via svnmerge from
X-Git-Tag: 10.9.0-digiumphones-rc1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36128ee3bfe6605083078919c80afa69413b9746;p=thirdparty%2Fasterisk.git

Merged revisions 372863 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

........
  r372863 | dlee | 2012-09-11 12:14:06 -0500 (Tue, 11 Sep 2012) | 4 lines

  Corrects the astsbindir setting when installing the sample asterisk.conf.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@372868 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index f302ce6880..1386f2c47d 100644
--- a/Makefile
+++ b/Makefile
@@ -628,6 +628,7 @@ samples: adsi
 			-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" ; \