From 318f0f55146c127ae7404b606454d23fe9752d01 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Wed, 17 Aug 2011 19:30:50 +0000 Subject: Merged revisions 332369 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/10 ................ r332369 | tilghman | 2011-08-17 14:24:59 -0500 (Wed, 17 Aug 2011) | 17 lines Merged revisions 332355 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r332355 | tilghman | 2011-08-17 14:21:36 -0500 (Wed, 17 Aug 2011) | 10 lines Re-add support for spaces in pathnames, including now spaces in DESTDIR. This was initially added to 1.8 prior to release, primarily to support the standard paths on Mac OS X, but was partially reverted recently in Subversion, due to the lack of support for spaces in DESTDIR. This commit restores support for the standard paths on Mac OS X, and also includes support for spaces in DESTDIR. (closes issue ASTERISK-18290) Reported by: pabelanger Review: https://reviewboard.asterisk.org/r/1326/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332388 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- sounds/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sounds') diff --git a/sounds/Makefile b/sounds/Makefile index 9826d9fb8..ccdd4ca6f 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -16,9 +16,9 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/makeopts CMD_PREFIX?=@ -SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds +SOUNDS_DIR:=$(MAKE_ASTDATADIR)/sounds SOUNDS_CACHE_DIR?= -MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh +MOH_DIR:=$(MAKE_ASTDATADIR)/moh CORE_SOUNDS_VERSION:=1.4.21 EXTRA_SOUNDS_VERSION:=1.4.11 MOH_VERSION:=2.03 -- cgit v1.2.3