asterisk: Remove hardcoded staging references

diff --git a/packages/asterisk/asterisk_1.4.10.bb b/packages/asterisk/asterisk_1.4.10.bb
index 4110f01930b215b6ded8eedfa716a34588de264f..416495a0b8f1795ce1f98d1a9aa9b236bc2b2ed6 100644 (file)
--- 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 0d4f30aef90b0932c97565fa731e257357d31d70..2f116864e46980caf878b7a4200a6d726b3fa796 100644 (file)
--- 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 fb6458136439cbf34f627a6d5a332b5449c0ea6a..cecb40326286ad0f5a0a690ff855339fb6659972 100644 (file)
--- 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\