From 0c42b9197d8fcd8a72003479f63b6c5d673f53b8 Mon Sep 17 00:00:00 2001
From: pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Wed, 29 Dec 2010 18:24:19 +0000
Subject: 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
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@299908 f38db490-d61c-443f-a65b-d21fe96a405b
---
 Makefile                          |  2 +-
 build_tools/make_sample_voicemail | 12 ++++++------
 sounds/Makefile                   |  3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index c47c4f148..193b0be0b 100644
--- a/Makefile
+++ b/Makefile
@@ -690,7 +690,7 @@ samples: adsi
 		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" ;	\
diff --git a/build_tools/make_sample_voicemail b/build_tools/make_sample_voicemail
index 272cf379a..78062dd70 100755
--- a/build_tools/make_sample_voicemail
+++ b/build_tools/make_sample_voicemail
@@ -4,22 +4,22 @@ for lang in /en/ /fr/ /es/
   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
diff --git a/sounds/Makefile b/sounds/Makefile
index 7ac405d38..47b42d9a0 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -144,6 +144,9 @@ endif
 all: prefixcmd $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
 
 prefixcmd:
+	if [ -d $(TMPDATADIR) ] ; then \
+		rm -rf $(TMPDATADIR) ; \
+	fi
 	@$(PREFIXCMD)
 
 have_download:
-- 
cgit v1.2.3