diff options
| -rwxr-xr-x | Makefile | 2 | ||||
| -rwxr-xr-x | contrib/scripts/safe_asterisk | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -598,7 +598,7 @@ bininstall: all install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ - install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ + cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ fi for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done install -d $(DESTDIR)$(ASTHEADERDIR) diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk index 78013c9a0..2cfab55da 100755 --- a/contrib/scripts/safe_asterisk +++ b/contrib/scripts/safe_asterisk @@ -5,6 +5,7 @@ CONSOLE=yes # Whether or not you want a console #NOTIFY=ben@alkaloid.net # Who to notify about crashes MACHINE=`hostname` # To specify which machine has crashed when getting the mail DUMPDROP=/tmp +ASTSBINDIR=__ASTERISK_SBIN_DIR__ # # Don't fork when running "safely" # @@ -44,10 +45,10 @@ run_asterisk() if [ "$TTY" != "" ]; then cd /tmp stty sane < /dev/${TTY} - asterisk ${CLIARGS} ${ASTARGS} >& /dev/${TTY} < /dev/${TTY} + ${ASTSBINDIR}/asterisk ${CLIARGS} ${ASTARGS} >& /dev/${TTY} < /dev/${TTY} else cd /tmp - asterisk ${CLIARGS} ${ASTARGS} + ${ASTSBINDIR}/asterisk ${CLIARGS} ${ASTARGS} fi EXITSTATUS=$? echo "Asterisk ended with exit status $EXITSTATUS" |