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 f302ce68802fe57228cf96a1f094346191486041..1386f2c47d7b2a70ad4678445996c13828c317b7 100644 (file)
--- 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" ; \