[asterisk-commits] pabelanger: trunk r299908 - in /trunk: ./ build_tools/ sounds/

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Wed Dec 29 12:24:19 2010
New Revision: 299908

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=299908
Log:
Merged revisions 299907 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r299907 | pabelanger | 2010-12-29 13:22:23 -0500 (Wed, 29 Dec 2010) | 2 lines
  
  Properly quote varibles for MAC OS X
........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/build_tools/make_sample_voicemail
    trunk/sounds/Makefile

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

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=299908&r1=299907&r2=299908
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Dec 29 12:24:19 2010
@@ -690,7 +690,7 @@
 		rm -f $(DESTDIR)$(ASTCONFPATH).tmp ; \
 	fi ; \
 	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-	build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
+	build_tools/make_sample_voicemail "$(DESTDIR)$(ASTDATADIR)" "$(DESTDIR)$(ASTSPOOLDIR)"
 
 	@for x in phoneprov/*; do \
 		dst="$(DESTDIR)$(ASTDATADIR)/$$x" ;	\

Modified: trunk/build_tools/make_sample_voicemail
URL: http://svnview.digium.com/svn/asterisk/trunk/build_tools/make_sample_voicemail?view=diff&rev=299908&r1=299907&r2=299908
==============================================================================
--- trunk/build_tools/make_sample_voicemail (original)
+++ trunk/build_tools/make_sample_voicemail Wed Dec 29 12:24:19 2010
@@ -4,22 +4,22 @@
   do
   for format in ulaw alaw wav gsm g729 g722
     do
-    [ ! -f ${1}/sounds${lang}vm-isunavail.${format} ] && continue
+    [ ! -f "${1}/sounds${lang}vm-isunavail.${format}" ] && continue
 
-    mkdir -p ${2}/voicemail/default/1234${lang}
+    mkdir -p "${2}/voicemail/default/1234${lang}"
     
-    : > ${2}/voicemail/default/1234${lang}unavail.${format}
+    : > "${2}/voicemail/default/1234${lang}unavail.${format}"
     
     for file in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail
       do
-      cat ${1}/sounds${lang}${file}.${format} >> ${2}/voicemail/default/1234${lang}unavail.${format}
+      cat "${1}/sounds${lang}${file}.${format}" >> "${2}/voicemail/default/1234${lang}unavail.${format}"
     done
 
-    : > ${2}/voicemail/default/1234${lang}busy.${format}
+    : > "${2}/voicemail/default/1234${lang}busy.${format}"
     
     for file in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone
       do
-      cat ${1}/sounds${lang}${file}.${format} >> ${2}/voicemail/default/1234${lang}busy.${format}
+      cat "${1}/sounds${lang}${file}.${format}" >> "${2}/voicemail/default/1234${lang}busy.${format}"
     done
   done
 done

Modified: trunk/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/sounds/Makefile?view=diff&rev=299908&r1=299907&r2=299908
==============================================================================
--- trunk/sounds/Makefile (original)
+++ trunk/sounds/Makefile Wed Dec 29 12:24:19 2010
@@ -144,6 +144,9 @@
 all: prefixcmd $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
 
 prefixcmd:
+	if [ -d $(TMPDATADIR) ] ; then \
+		rm -rf $(TMPDATADIR) ; \
+	fi
 	@$(PREFIXCMD)
 
 have_download: