[asterisk-commits] trunk r19354 - in /trunk: ./ Makefile

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue Apr 11 16:59:40 2006
New Revision: 19354

URL: http://svn.digium.com/view/asterisk?rev=19354&view=rev
Log:
Merged revisions 19353 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r19353 | kpfleming | 2006-04-11 16:58:47 -0500 (Tue, 11 Apr 2006) | 2 lines

don't create a 'voicemail' symlink in the sounds directory; app_voicemail has not needed it since January of 2005 (issue #6613)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

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

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=19354&r1=19353&r2=19354&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Apr 11 16:59:40 2006
@@ -674,7 +674,6 @@
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
@@ -693,7 +692,6 @@
 	else \
 		echo "You need to do cvs update -d not just cvs update" ; \
 	fi 
-	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
 	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
 	@echo " +---- Asterisk Installation Complete -------+"  
 	@echo " +                                           +"