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. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@299824 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
7251be831b
commit
47dfe79e72
|
@ -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)
|
||||
|
||||
|
|
Reference in New Issue