[svn-commits] tilghman: branch 1.6.2 r268535 - in /branches/1.6.2: ./ contrib/init.d/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Jun  6 00:31:11 2010
New Revision: 268535

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=268535
Log:
Merged revisions 268534 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r268534 | tilghman | 2010-06-06 00:29:50 -0500 (Sun, 06 Jun 2010) | 8 lines
  
  Take advantage of variable substitution already in the Makefile to specify the correct location for files in init.d.
  
  (closes issue #16979)
   Reported by: jw-asterisk
   
  (issue #15691)
   Reported by: itamarjp
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/contrib/init.d/rc.redhat.asterisk

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/contrib/init.d/rc.redhat.asterisk
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/contrib/init.d/rc.redhat.asterisk?view=diff&rev=268535&r1=268534&r2=268535
==============================================================================
--- branches/1.6.2/contrib/init.d/rc.redhat.asterisk (original)
+++ branches/1.6.2/contrib/init.d/rc.redhat.asterisk Sun Jun  6 00:31:11 2010
@@ -6,7 +6,7 @@
 # chkconfig: 2345 90 60
 # description: Asterisk PBX and telephony daemon.
 # processname: asterisk
-# pidfile: /var/run/asterisk.pid
+# pidfile: __ASTERISK_VARRUN_DIR__/asterisk.pid
 #
 # Thu Nov 17 2005 Gregory Boehnlein <damin at nacs.net>
 # - Updated Version to 1.3
@@ -21,10 +21,10 @@
 # - Modified "reload" to call asterisk -rx 'reload' 
 
 # Use this option to specify a different configuration directory
-#AST_CONFIG=/etc/asterisk
+#AST_CONFIG=__ASTERISK_ETC_DIR__
 
 # Installation directory
-AST_SBIN=/usr/sbin
+AST_SBIN=__ASTERISK_SBIN_DIR__
 
 # Uncomment the following and set them to the user/groups that you
 # want to run Asterisk as. NOTE: this requires substantial work to