From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 27 Dec 2010 21:23:10 +0000 (+0000)
Subject: More space-in-pathname issues.
X-Git-Tag: 1.8.3-rc1~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c23b84073107aaf79fe2d748dae80af48b81235;p=thirdparty%2Fasterisk.git

More space-in-pathname issues.


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

diff --git a/sounds/Makefile b/sounds/Makefile
index 9867b65988..7ac405d38f 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -18,14 +18,16 @@
 # Make doesn't tolerate spaces in pathnames well.  I hate to hardcode the OS X
 # path, but Make doesn't allow spaces as arguments, either.
 ifneq ($(findstring Application Support,$(ASTDATADIR)),)
-ASTDATADIR=/tmp/astdatadir
+TMPDATADIR=/tmp/astdatadir
 PREFIXCMD=ln -sf "$(ASTDATADIR)/" /tmp/astdatadir
+else
+TMPDATADIR=$(ASTDATADIR)
 endif
 
 CMD_PREFIX?=@
-SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
+SOUNDS_DIR:=$(DESTDIR)$(TMPDATADIR)/sounds
 SOUNDS_CACHE_DIR?=
-MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
+MOH_DIR:=$(DESTDIR)$(TMPDATADIR)/moh
 CORE_SOUNDS_VERSION:=1.4.20
 EXTRA_SOUNDS_VERSION:=1.4.11
 MOH_VERSION:=2.03
@@ -186,7 +188,7 @@ dist-clean:
 	rm -f *.tar.gz
 
 $(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR):
-	$(INSTALL) -d $@
+	mkdir -p $@
 
 install: prefixcmd $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)