diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-27 21:23:10 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-27 21:23:10 +0000 |
| commit | b2492b03ab17c14cb0a4ddaefd3d5f2b9bf9cf03 (patch) | |
| tree | eed6e0e4f06e5e469b6a0ec8ddd1d792088efb78 /sounds | |
| parent | deb0f29f87bf73600cc5a6a94dd3f2321d1e54ee (diff) | |
More space-in-pathname issues.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@299820 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'sounds')
| -rw-r--r-- | sounds/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index 9867b6598..7ac405d38 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) |