From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 21 Feb 2008 13:19:58 +0000 (+0000)
Subject: asterisk: Remove hardcoded staging references
X-Git-Tag: Release-2010-05/1~7616^2~7^2^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de888109692d3bcb8be8b1268b6b0ad15cbc9879;p=openembedded.git

asterisk: Remove hardcoded staging references
---

diff --git a/packages/asterisk/asterisk_1.4.10.bb b/packages/asterisk/asterisk_1.4.10.bb
index 4110f01930..416495a0b8 100644
--- a/packages/asterisk/asterisk_1.4.10.bb
+++ b/packages/asterisk/asterisk_1.4.10.bb
@@ -30,17 +30,17 @@ INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR} \
+			--with-z=${STAGING_EXECPREFIXDIR} \
+			--with-curl=${STAGING_EXECPREFIXDIR} \
+			--with-termcap=${STAGING_EXECPREFIXDIR} \
+			--with-ogg=${STAGING_EXECPREFIXDIR} \
+			--with-vorbis=${STAGING_EXECPREFIXDIR} \
+			--with-sqlite=${STAGING_EXECPREFIXDIR} \
+			--with-popt=${STAGING_EXECPREFIXDIR} \
+			--with-gnutls=${STAGING_EXECPREFIXDIR} \
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR} \
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\
diff --git a/packages/asterisk/asterisk_1.4.11.bb b/packages/asterisk/asterisk_1.4.11.bb
index 0d4f30aef9..2f116864e4 100644
--- a/packages/asterisk/asterisk_1.4.11.bb
+++ b/packages/asterisk/asterisk_1.4.11.bb
@@ -32,17 +32,17 @@ INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR}\
+			--with-z=${STAGING_EXECPREFIXDIR}\
+			--with-curl=${STAGING_EXECPREFIXDIR}\
+			--with-termcap=${STAGING_EXECPREFIXDIR}\
+			--with-ogg=${STAGING_EXECPREFIXDIR}\
+			--with-vorbis=${STAGING_EXECPREFIXDIR}\
+			--with-sqlite=${STAGING_EXECPREFIXDIR}\
+			--with-popt=${STAGING_EXECPREFIXDIR}\
+			--with-gnutls=${STAGING_EXECPREFIXDIR}\
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR}\
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\
diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb
index fb64581364..cecb403262 100644
--- a/packages/asterisk/asterisk_1.4.17.bb
+++ b/packages/asterisk/asterisk_1.4.17.bb
@@ -31,17 +31,17 @@ INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR} \
+			--with-z=${STAGING_EXECPREFIXDIR} \
+			--with-curl=${STAGING_EXECPREFIXDIR} \
+			--with-termcap=${STAGING_EXECPREFIXDIR} \
+			--with-ogg=${STAGING_EXECPREFIXDIR} \
+			--with-vorbis=${STAGING_EXECPREFIXDIR} \
+			--with-sqlite=${STAGING_EXECPREFIXDIR} \
+			--with-popt=${STAGING_EXECPREFIXDIR} \
+			--with-gnutls=${STAGING_EXECPREFIXDIR} \
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR} \
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\