Move voicemail2 to voicemail, retain compatibility with "Voicemail2"

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1735 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

@@ -313,6 +313,7 @@ bininstall: all
 	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
 	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
 	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
+	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys

apps/Makefile

@@ -23,7 +23,7 @@ APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_mp3.so\
      app_setcidname.so app_lookupcidname.so app_substring.so app_macro.so \
      app_authenticate.so app_softhangup.so app_lookupblacklist.so \
      app_waitforring.so app_privacy.so app_db.so app_chanisavail.so \
-     app_enumlookup.so app_voicemail2.so app_transfer.so app_setcidnum.so app_cdr.so \
+     app_enumlookup.so app_transfer.so app_setcidnum.so app_cdr.so \
      app_hasnewvoicemail.so app_sayunixtime.so app_cut.so app_read.so
 
 ifneq (${OSARCH},Darwin)