diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-27 20:42:01 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-27 20:42:01 +0000 |
| commit | fb3520e439465588ffd8beee0c15370be296035f (patch) | |
| tree | 000484c3ae43492282f047c2c6bf70fe5e40b74f /sounds | |
| parent | ecf3c1a322b407e24ebb2aadd74c25aaad3bf36a (diff) | |
Merged revisions 299794 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r299794 | tilghman | 2010-12-27 14:41:04 -0600 (Mon, 27 Dec 2010) | 2 lines
Mac OS X spaces-in-pathnames fix.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299795 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'sounds')
| -rw-r--r-- | sounds/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index 0945e6741..9867b6598 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -15,6 +15,13 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/makeopts +# 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 +PREFIXCMD=ln -sf "$(ASTDATADIR)/" /tmp/astdatadir +endif + CMD_PREFIX?=@ SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds SOUNDS_CACHE_DIR?= @@ -132,7 +139,10 @@ endef endif -all: $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH) +all: prefixcmd $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH) + +prefixcmd: + @$(PREFIXCMD) have_download: @if test "$(DOWNLOAD)" = ":" ; then \ @@ -178,7 +188,7 @@ dist-clean: $(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR): $(INSTALL) -d $@ -install: $(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) +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) uninstall: rm -rf $(SOUNDS_DIR) |