diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-27 20:41:04 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-27 20:41:04 +0000 |
commit | deb0f29f87bf73600cc5a6a94dd3f2321d1e54ee (patch) | |
tree | c207aced621f09a7cff047fe75d3fcd20e3a2d6e /sounds | |
parent | 1c27dc5fef2e253aedaa35f4b72b233c2514f42a (diff) |
Mac OS X spaces-in-pathnames fix.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@299794 f38db490-d61c-443f-a65b-d21fe96a405b
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) |