[svn-commits] tilghman: branch 1.6.0 r133405 - in /branches/1.6.0: ./ contrib/scripts/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jul 24 00:21:56 2008
New Revision: 133405

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

........
r133400 | tilghman | 2008-07-24 00:21:00 -0500 (Thu, 24 Jul 2008) | 3 lines

Build the logrotate script according to paths
(Closes issue #13147)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile
    branches/1.6.0/contrib/scripts/asterisk.logrotate

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

Modified: branches/1.6.0/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/Makefile?view=diff&rev=133405&r1=133404&r2=133405
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Thu Jul 24 00:21:56 2008
@@ -762,7 +762,9 @@
 	if [ ! -d $(ASTETCDIR)/../logrotate.d ]; then \
 		mkdir $(ASTETCDIR)/../logrotate.d ; \
 	fi
-	install -m 0644 contrib/scripts/asterisk.logrotate $(ASTETCDIR)/../logrotate.d/asterisk
+	sed 's#__LOGDIR__#$(ASTLOGDIR)#g' < contrib/scripts/asterisk.logrotate | sed 's#__SBINDIR__#$(ASTSBINDIR)#g' > contrib/scripts/asterisk.logrotate.tmp
+	install -m 0644 contrib/scripts/asterisk.logrotate.tmp $(ASTETCDIR)/../logrotate.d/asterisk
+	rm -f contrib/scripts/asterisk.logrotate.tmp
 
 config:
 	@if [ "${OSARCH}" = "linux-gnu" ]; then \

Modified: branches/1.6.0/contrib/scripts/asterisk.logrotate
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/contrib/scripts/asterisk.logrotate?view=diff&rev=133405&r1=133404&r2=133405
==============================================================================
--- branches/1.6.0/contrib/scripts/asterisk.logrotate (original)
+++ branches/1.6.0/contrib/scripts/asterisk.logrotate Thu Jul 24 00:21:56 2008
@@ -1,4 +1,4 @@
-/var/log/asterisk/debug /var/log/asterisk/console /var/log/asterisk/full /var/log/asterisk/debug /var/log/asterisk/*log {
+__LOGDIR__/debug __LOGDIR__/console __LOGDIR__/full __LOGDIR__/messages __LOGDIR__/*log {
 	weekly
 	missingok
 	rotate 52
@@ -8,6 +8,6 @@
 	create 640 root root 
 	sharedscripts
 	postrotate
-		/usr/sbin/asterisk -rx 'logger reload' > /dev/null 2> /dev/null	
+		__SBINDIR__/asterisk -rx 'logger reload' > /dev/null 2> /dev/null	
 	endscript
-} 
+}