[svn-commits] tilghman: trunk r89304 - in /trunk: ./ Makefile

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Nov 15 12:49:31 2007
New Revision: 89304

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89304
Log:
Merged revisions 89302 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89302 | tilghman | 2007-11-15 12:37:38 -0600 (Thu, 15 Nov 2007) | 2 lines

Start Asterisk in Debian at a more reasonable time (since zaptel is at level 20)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=89304&r1=89303&r2=89304
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Nov 15 12:49:31 2007
@@ -668,11 +668,11 @@
 			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
 		elif [ -f /etc/debian_version ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk $(DESTDIR)/etc/init.d/asterisk; \
-			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
+			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 50 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
 		elif [ -f /etc/gentoo-release ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk $(DESTDIR)/etc/init.d/asterisk; \
 			if [ -z "$(DESTDIR)" ]; then /sbin/rc-update add asterisk default; fi; \
-		elif [ -f /etc/mandrake-release ]; then \
+		elif [ -f /etc/mandrake-release -o -f /etc/mandriva-release ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
 			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
 		elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \