[prev in list] [next in list] [prev in thread] [next in thread] 

List:       asterisk-commits
Subject:    [asterisk-commits] tilghman: branch 1.8 r299820 -
From:       SVN commits to the Asterisk project <asterisk-commits () lists ! digium ! com>
Date:       2010-12-27 21:23:12
Message-ID: E1PXKXA-0000HN-FW () wibble ! digium ! internal
[Download RAW message or body]

Author: tilghman
Date: Mon Dec 27 15:23:10 2010
New Revision: 299820

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=299820
Log:
More space-in-pathname issues.

Modified:
    branches/1.8/sounds/Makefile

Modified: branches/1.8/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/sounds/Makefile?view=diff&rev=299820&r1=299819&r2=299820
 ==============================================================================
--- branches/1.8/sounds/Makefile (original)
+++ branches/1.8/sounds/Makefile Mon Dec 27 15:23:10 2010
@@ -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 @@
 	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)  


--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-commits mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-commits


[prev in list] [next in list] [prev in thread] [next in thread]