Merged revisions 299820 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 27 Dec 2010 21:23:55 +0000 (21:23 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 27 Dec 2010 21:23:55 +0000 (21:23 +0000)
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.
........

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

sounds/Makefile

index 9867b65..7ac405d 100644 (file)
 # 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)