diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-26 16:09:38 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-26 16:09:38 +0000 |
| commit | 1aa69230ea34ef65351fcbad4515f45eb5cc5531 (patch) | |
| tree | 93f6fad5d2ef45e19db1d2e982002623186874a5 /sounds/Makefile | |
| parent | 34c3f397e3b4efb4f30ccda45b58735f70556ca1 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@104133 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'sounds/Makefile')
| -rw-r--r-- | sounds/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index a31dcb2cf..434ef5ab2 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 |