From d271a946b1e43455c178fbf1c2dd6cbbecc7b023 Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 19 Jul 2011 21:32:54 +0000
Subject: Merged revisions 328879 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/2.0

................
  r328879 | kpfleming | 2011-07-19 16:31:16 -0500 (Tue, 19 Jul 2011) | 23 lines

  Merged revisions 328878 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r328878 | kpfleming | 2011-07-19 16:29:07 -0500 (Tue, 19 Jul 2011) | 17 lines

    Revert partial attempt at handling pathnames with spaces.

    Revision 299794 attempted to improve the build system to be able to handle
    pathnames (primarily DESTDIR) with spaces in them, since this is common on
    some platforms (including Mac OSX). Unfortunately, the changes were incomplete
    and did not actually provide the desired behavior, and as a side effect the
    functionality that ensured that stale headers in the Asterisk 'include' directory
    were removed got broken. In addition, the check for stale (and possibly
    incompatible) modules in the Asterisk 'modules' directory also got broken, and
    would never report any stale modules. Users upgrading to this version or later
    versions would then see unexpected module load errors.

    Since there are few users who actually want to install Asterisk into paths
    that contain spaces, and a proper fix for the build system would take many hours,
    the best solution for now is to just revert the partial solution.
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328881 f38db490-d61c-443f-a65b-d21fe96a405b
---
 sounds/Makefile | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to 'sounds/Makefile')

diff --git a/sounds/Makefile b/sounds/Makefile
index 178c30c7b..9826d9fb8 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -15,19 +15,10 @@
 
 -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)),)
-TMPDATADIR=/tmp/astdatadir
-PREFIXCMD=ln -sf "$(ASTDATADIR)/" /tmp/astdatadir
-else
-TMPDATADIR=$(ASTDATADIR)
-endif
-
 CMD_PREFIX?=@
-SOUNDS_DIR:=$(DESTDIR)$(TMPDATADIR)/sounds
+SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 SOUNDS_CACHE_DIR?=
-MOH_DIR:=$(DESTDIR)$(TMPDATADIR)/moh
+MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
 CORE_SOUNDS_VERSION:=1.4.21
 EXTRA_SOUNDS_VERSION:=1.4.11
 MOH_VERSION:=2.03
@@ -142,13 +133,7 @@ endef
 
 endif
 
-all: prefixcmd $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
-
-prefixcmd:
-	if [ -d /tmp/astdatadir ] ; then \
-		rm -rf /tmp/astdatadir ; \
-	fi
-	@$(PREFIXCMD)
+all: $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
 
 have_download:
 	@if test "$(DOWNLOAD)" = ":" ; then \
@@ -196,7 +181,7 @@ dist-clean:
 $(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/ru $(SOUNDS_CACHE_DIR):
 	mkdir -p $@
 
-install: prefixcmd $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/ru $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
+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)
 
 uninstall:
 	rm -rf $(SOUNDS_DIR)
-- 
cgit v1.2.3