diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-26 16:08:44 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-26 16:08:44 +0000 |
| commit | 2bc3c6aacc190998d8236094be6f5dae553e64af (patch) | |
| tree | 50ed7712b94533d1d7a086493a532bf64526e679 /sounds | |
| parent | a507c4cfd71ee35d48b7b4534cd36e52397d7124 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@104132 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'sounds')
| -rw-r--r-- | sounds/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index a37a4715c..c95223ea4 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -16,8 +16,8 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/makeopts PWD:=$(shell pwd) -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 |