[svn-commits] tilghman: trunk r299824 - in /trunk: ./ sounds/Makefile

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Dec 27 15:23:55 2010
New Revision: 299824

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

........
  r299820 | tilghman | 2010-12-27 15:23:10 -0600 (Mon, 27 Dec 2010) | 2 lines
  
  More space-in-pathname issues.
........

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

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

Modified: trunk/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/sounds/Makefile?view=diff&rev=299824&r1=299823&r2=299824
==============================================================================
--- trunk/sounds/Makefile (original)
+++ trunk/sounds/Makefile Mon Dec 27 15:23:55 2010
@@ -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 @@
 	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)