Merged revisions 104135 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r104135 | qwell | 2008-02-26 10:35:06 -0600 (Tue, 26 Feb 2008) | 5 lines

Revert previous abspath change.
...abspath is new in GNU make 3.81.  I feel so...defeated.

Must find new fix!

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104136 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/sounds/Makefile b/sounds/Makefile
index 434ef5a..a31dcb2 100644 (file)
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -15,8 +15,8 @@
 
 -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/makeopts
 
 
 -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/makeopts
 

-SOUNDS_DIR:=$(abspath $(DESTDIR)$(ASTDATADIR)/sounds)
-MOH_DIR:=$(abspath $(DESTDIR)$(ASTDATADIR)/moh)
+SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
+MOH_DIR:=$(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
 CORE_SOUNDS_VERSION:=1.4.8
 EXTRA_SOUNDS_VERSION:=1.4.7
 SOUNDS_URL:=http://downloads.digium.com/pub/telephony/sounds/releases