[svn-commits] qwell: trunk r104133 - in /trunk: ./ sounds/Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Feb 26 10:09:38 2008
New Revision: 104133

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104133
Log:
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*)

........

Modified:
    trunk/   (props changed)
    trunk/sounds/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/sounds/Makefile?view=diff&rev=104133&r1=104132&r2=104133
==============================================================================
--- trunk/sounds/Makefile (original)
+++ trunk/sounds/Makefile Tue Feb 26 10:09:38 2008
@@ -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