automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@71875 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

@@ -868,7 +868,9 @@ config:
 		$(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
 		/sbin/chkconfig --add asterisk; \
 	elif [ -d /etc/init.d ]; then \
-		$(INSTALL) -m 755 init.asterisk /etc/init.d/asterisk; \
+		echo "Only distros that use rc.d based init scripts are currently supported."; \
+		echo "You may be able to copy one of the scripts in contrib/init.d/ into your /etc/init.d/ directory."; \
+		exit 1; \
 	fi 
 
 dont-optimize: install