summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-11-18 00:45:00 +0000
committerRichard Purdie <rpurdie@rpsys.net>2007-11-18 00:45:00 +0000
commitbbdf99288aa693ba22a4256eb225187027f1fee5 (patch)
tree9426e2df11d0a84b7ab4fbd28c4562d9251950cb /packages
parent73c0be6148f1ccfae4a9eb53265a74090d6f68aa (diff)
packages: Remove various hardcoded staging layout assumptions
Diffstat (limited to 'packages')
-rw-r--r--packages/apr/apr-util_0.9.12.bb2
-rw-r--r--packages/apr/apr-util_1.2.7.bb4
-rw-r--r--packages/asterisk/asterisk_1.2.24.bb2
-rw-r--r--packages/boost/boost_1.33.0.bb2
-rw-r--r--packages/boost/boost_1.33.1.bb2
-rw-r--r--packages/clamav/clamav.inc2
-rw-r--r--packages/duma/duma_2.5.7.bb2
-rw-r--r--packages/enchant/enchant_1.1.3.bb4
-rw-r--r--packages/enchant/enchant_1.2.5.bb6
-rw-r--r--packages/enchant/enchant_1.3.0.bb2
-rw-r--r--packages/file-roller/file-roller_2.6.1.bb2
-rw-r--r--packages/gcalctool/gcalctool_5.5.21.bb2
-rw-r--r--packages/gnome/gnome-desktop_2.10.2.bb4
-rw-r--r--packages/gnome/gnome-desktop_2.16.1.bb4
-rw-r--r--packages/gnome/gnome-desktop_2.18.3.bb2
-rw-r--r--packages/gnome/gnome-desktop_2.7.90.bb4
-rw-r--r--packages/gpdf/gpdf_2.10.0.bb2
-rw-r--r--packages/gpdf/gpdf_2.8.0.bb2
-rw-r--r--packages/gpdf/gpdf_2.8.2.bb2
19 files changed, 26 insertions, 26 deletions
diff --git a/packages/apr/apr-util_0.9.12.bb b/packages/apr/apr-util_0.9.12.bb
index b726f2adf1..d5964added 100644
--- a/packages/apr/apr-util_0.9.12.bb
+++ b/packages/apr/apr-util_0.9.12.bb
@@ -9,7 +9,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
file://gen_uri_delims.patch;patch=1 \
file://uri_delims.h"
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
inherit autotools lib_package binconfig
diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb
index c73eb8023c..ea81607953 100644
--- a/packages/apr/apr-util_1.2.7.bb
+++ b/packages/apr/apr-util_1.2.7.bb
@@ -9,10 +9,10 @@ PR = "r2"
SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz"
EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
- --with-gdbm=${STAGING_DIR}/${HOST_SYS} \
+ --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
--without-sqlite2 \
--without-sqlite3 \
- --with-expat=${STAGING_DIR}/${HOST_SYS}"
+ --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
inherit autotools lib_package binconfig
diff --git a/packages/asterisk/asterisk_1.2.24.bb b/packages/asterisk/asterisk_1.2.24.bb
index 01b825d19e..1673276f45 100644
--- a/packages/asterisk/asterisk_1.2.24.bb
+++ b/packages/asterisk/asterisk_1.2.24.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/asterisk-${PV}"
export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
-export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
+export CROSS_COMPILE_TARGET="${STAGING_DIR_HOST}"
export CROSS_ARCH="Linux"
export CROSS_PROC="${TARGET_ARCH}"
diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb
index 0a72d360d6..6d4a2b860f 100644
--- a/packages/boost/boost_1.33.0.bb
+++ b/packages/boost/boost_1.33.0.bb
@@ -63,7 +63,7 @@ FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}"
#PYTHON_ROOT = "/dev/null"
# to remove the python build
DEPENDS += "python"
-PYTHON_ROOT = "${STAGING_DIR}/${HOST_SYS}"
+PYTHON_ROOT = "${STAGING_DIR_HOST}"
PYTHON_VERSION = "2.4"
PACKAGES += "boost-python"
diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb
index 4de97661d3..f132785d79 100644
--- a/packages/boost/boost_1.33.1.bb
+++ b/packages/boost/boost_1.33.1.bb
@@ -63,7 +63,7 @@ FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}"
#PYTHON_ROOT = "/dev/null"
# to remove the python build
DEPENDS += "python"
-PYTHON_ROOT = "${STAGING_DIR}/${HOST_SYS}"
+PYTHON_ROOT = "${STAGING_DIR_HOST}"
PYTHON_VERSION = "2.4"
PACKAGES += "boost-python"
diff --git a/packages/clamav/clamav.inc b/packages/clamav/clamav.inc
index 6bdd36c7d2..49b8023a53 100644
--- a/packages/clamav/clamav.inc
+++ b/packages/clamav/clamav.inc
@@ -33,7 +33,7 @@ inherit autotools update-rc.d binconfig
# Don't check for clamav uid/gid - they don't exist on the host
# Put virus definitions in /var/lib not /usr/lib
EXTRA_OECONF = "--disable-clamav \
- --with-zlib=${STAGING_DIR}/${HOST_SYS} \
+ --with-zlib=${STAGING_DIR_HOST}${layout_prefix} \
--with-libcurl \
--with-dbdir=${localstatedir}/lib/clamav"
diff --git a/packages/duma/duma_2.5.7.bb b/packages/duma/duma_2.5.7.bb
index d4bc416234..9f50c356a6 100644
--- a/packages/duma/duma_2.5.7.bb
+++ b/packages/duma/duma_2.5.7.bb
@@ -12,7 +12,7 @@ EXTRA_OECONF = "-e"
do_configure () {
oe_runmake createconf
- qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${HOST_SYS} ./createconf
+ qemu-${TARGET_ARCH} -L ${STAGING_DIR_HOST} ./createconf
}
do_compile () {
diff --git a/packages/enchant/enchant_1.1.3.bb b/packages/enchant/enchant_1.1.3.bb
index c33a1a3927..7618c5d3ee 100644
--- a/packages/enchant/enchant_1.1.3.bb
+++ b/packages/enchant/enchant_1.1.3.bb
@@ -14,10 +14,10 @@ S = "${WORKDIR}/enchant-${PV}"
SRC_URI = "http://download.sourceforge.net/abiword/enchant-1.1.3.tar.gz"
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
+ oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
bindir=${STAGING_BINDIR} \
includedir=${STAGING_INCDIR} \
libdir=${STAGING_LIBDIR} \
datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DIR}/share/man
+ mandir=${STAGING_DIR_HOST}${layout_mandir}
}
diff --git a/packages/enchant/enchant_1.2.5.bb b/packages/enchant/enchant_1.2.5.bb
index 5896d1275a..be9082d2af 100644
--- a/packages/enchant/enchant_1.2.5.bb
+++ b/packages/enchant/enchant_1.2.5.bb
@@ -14,15 +14,15 @@ S = "${WORKDIR}/enchant-${PV}"
SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz \
file://configure.patch;patch=1"
-EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR}/${HOST_SYS} --enable-aspell --disable-binreloc"
+EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} --enable-aspell --disable-binreloc"
FILES_${PN} = "/usr/bin/* /usr/lib/enchant/*.so /usr/share/enchant /usr/lib/libenchant*.so.*"
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
+ oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
bindir=${STAGING_BINDIR} \
includedir=${STAGING_INCDIR} \
libdir=${STAGING_LIBDIR} \
datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DIR}/share/man
+ mandir=${STAGING_DIR_HOST}${layout_mandir}
}
diff --git a/packages/enchant/enchant_1.3.0.bb b/packages/enchant/enchant_1.3.0.bb
index f1544336af..4e257618fb 100644
--- a/packages/enchant/enchant_1.3.0.bb
+++ b/packages/enchant/enchant_1.3.0.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/enchant-${PV}"
SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz"
-EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR}/${HOST_SYS} --enable-aspell --disable-binreloc"
+EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} --enable-aspell --disable-binreloc"
FILES_${PN} = "/usr/bin/* /usr/lib/enchant/*.so /usr/share/enchant /usr/lib/libenchant*.so.*"
diff --git a/packages/file-roller/file-roller_2.6.1.bb b/packages/file-roller/file-roller_2.6.1.bb
index f4490884bb..43ba49ac5e 100644
--- a/packages/file-roller/file-roller_2.6.1.bb
+++ b/packages/file-roller/file-roller_2.6.1.bb
@@ -11,5 +11,5 @@ DEPENDS="gtk+ libgnomeui gnome-common gnome-vfs libglade libbonoboui"
inherit autotools
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
diff --git a/packages/gcalctool/gcalctool_5.5.21.bb b/packages/gcalctool/gcalctool_5.5.21.bb
index 31f06e9bfd..ef16f09b46 100644
--- a/packages/gcalctool/gcalctool_5.5.21.bb
+++ b/packages/gcalctool/gcalctool_5.5.21.bb
@@ -14,5 +14,5 @@ EXTRA_OECONF = "--disable-schemas-install"
SRC_URI += "file://noscrollkeeper.patch;patch=1"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb
index 9957921327..b8e098f40c 100644
--- a/packages/gnome/gnome-desktop_2.10.2.bb
+++ b/packages/gnome/gnome-desktop_2.10.2.bb
@@ -6,10 +6,10 @@ inherit gnome pkgconfig
DEPENDS = "gnome-common libgnomeui"
-EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
+EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
do_stage () {
diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb
index 4d4b80efbc..69de709350 100644
--- a/packages/gnome/gnome-desktop_2.16.1.bb
+++ b/packages/gnome/gnome-desktop_2.16.1.bb
@@ -11,10 +11,10 @@ SRC_URI += "file://scrollkeeper.patch;patch=1 \
EXTRA_OECONF = "--disable-scrollkeeper"
-EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
+EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
FILES_${PN} += "${datadir}/gnome-about"
diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb
index e341fd31ab..c2888bf2a4 100644
--- a/packages/gnome/gnome-desktop_2.18.3.bb
+++ b/packages/gnome/gnome-desktop_2.18.3.bb
@@ -12,7 +12,7 @@ SRC_URI += "file://scrollkeeper.patch;patch=1 \
EXTRA_OECONF = "--disable-scrollkeeper"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
FILES_${PN} += "${datadir}/gnome-about"
diff --git a/packages/gnome/gnome-desktop_2.7.90.bb b/packages/gnome/gnome-desktop_2.7.90.bb
index 54a6559d05..c7fd61470d 100644
--- a/packages/gnome/gnome-desktop_2.7.90.bb
+++ b/packages/gnome/gnome-desktop_2.7.90.bb
@@ -6,10 +6,10 @@ inherit gnome
DEPENDS = "gnome-common libgnomeui"
-EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
+EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
do_stage () {
diff --git a/packages/gpdf/gpdf_2.10.0.bb b/packages/gpdf/gpdf_2.10.0.bb
index ee7d27080a..30c42dcb0c 100644
--- a/packages/gpdf/gpdf_2.10.0.bb
+++ b/packages/gpdf/gpdf_2.10.0.bb
@@ -12,5 +12,5 @@ DEPENDS = "gtk+ libgnomeui libbonoboui gnome-vfs gconf gettext libglade \
EXTRA_OECONF = "--disable-schemas-install"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}/help
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}/help
}
diff --git a/packages/gpdf/gpdf_2.8.0.bb b/packages/gpdf/gpdf_2.8.0.bb
index 60fc1d3007..b4afdb02b8 100644
--- a/packages/gpdf/gpdf_2.8.0.bb
+++ b/packages/gpdf/gpdf_2.8.0.bb
@@ -13,5 +13,5 @@ SRC_URI += "file://aclocal-lossage.patch;patch=1 \
file://desktop.patch;patch=1"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}/help
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}/help
}
diff --git a/packages/gpdf/gpdf_2.8.2.bb b/packages/gpdf/gpdf_2.8.2.bb
index 23e294bda7..3943ff93e1 100644
--- a/packages/gpdf/gpdf_2.8.2.bb
+++ b/packages/gpdf/gpdf_2.8.2.bb
@@ -12,5 +12,5 @@ EXTRA_OECONF = "--disable-schemas-install"
SRC_URI += "file://aclocal-lossage.patch;patch=1"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}/help
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}/help
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 13:21:43 +0000