From 2ccb170113b0d218bd1d19f63f84cd959d97c2ef Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Tue, 26 Feb 2008 16:09:38 +0000 Subject: [PATCH] Merged revisions 104132 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r104132 | qwell | 2008-02-26 10:08:44 -0600 (Tue, 26 Feb 2008) | 9 lines Fix a very bizarre issue we were seeing with our buildbot when using a DESTDIR that wasn't an absolute path (such as DESTDIR=~/asterisk-1.4). Apparently what was happening, was that some of the targets were being expanded to the full path, so $@ ended up being /root/asterisk-1.4/[...]/ rather than ~/asterisk-1.4/[...]/ It appears that this may be a new "feature" in GNU make. (*cough* http://en.wikipedia.org/wiki/Principle_of_least_surprise *cough*) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104133 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- sounds/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sounds/Makefile b/sounds/Makefile index a31dcb2cfe..434ef5ab2f 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -15,8 +15,8 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/makeopts -SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds -MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh +SOUNDS_DIR:=$(abspath $(DESTDIR)$(ASTDATADIR)/sounds) +MOH_DIR:=$(abspath $(DESTDIR)$(ASTDATADIR)/moh) CORE_SOUNDS_VERSION:=1.4.8 EXTRA_SOUNDS_VERSION:=1.4.7 SOUNDS_URL:=http://downloads.digium.com/pub/telephony/sounds/releases