[svn-commits] qwell: branch 1.4 r104132 - /branches/1.4/sounds/Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Feb 26 10:08:44 2008
New Revision: 104132

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104132
Log:
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:
    branches/1.4/sounds/Makefile

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