From 0b679927feee2ecfd77a32df0d29dec83ae0a32f Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 21 Mar 2013 22:45:44 +0000
Subject: apt: Fix case where ${B} != ${S}

Need to reference objects from ${B}.

(From OE-Core rev: 0610cf3ef864acc9ca98498b9810bcce0fbb935a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/apt/apt-native.inc  | 10 +++++-----
 meta/recipes-devtools/apt/apt-package.inc | 12 ++++++------
 meta/recipes-devtools/apt/apt.inc         |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc
index a29e986..294ca94 100644
--- a/meta/recipes-devtools/apt/apt-native.inc
+++ b/meta/recipes-devtools/apt/apt-native.inc
@@ -51,11 +51,11 @@ do_install_base () {
 	install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
 
 	install -d ${D}${libdir}/dpkg/methods/apt
-	install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 
-	install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0644 ${S}/dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0644 ${S}/dselect/names ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 ${S}/dselect/install ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 ${S}/dselect/setup ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 ${S}/dselect/update ${D}${libdir}/dpkg/methods/apt/ 
 
 	install -d ${D}${sysconfdir}/apt
 	install -d ${D}${sysconfdir}/apt/apt.conf.d
diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc
index b0e5056..0897d3a 100644
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ b/meta/recipes-devtools/apt/apt-package.inc
@@ -57,11 +57,11 @@ do_install () {
 	install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
 
 	install -d ${D}${libdir}/dpkg/methods/apt
-	install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 
-	install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0644 ${S}/dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0644 ${S}/dselect/names ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 ${S}/dselect/install ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 ${S}/dselect/setup ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 ${S}/dselect/update ${D}${libdir}/dpkg/methods/apt/ 
 
 	install -d ${D}${sysconfdir}/apt
 	install -d ${D}${sysconfdir}/apt/apt.conf.d
@@ -70,7 +70,7 @@ do_install () {
 	install -d ${D}${localstatedir}/lib/apt/lists/partial
 	install -d ${D}${localstatedir}/cache/apt/archives/partial
 	install -d ${D}${docdir}/apt/examples
-	install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/
+	install -m 0644 ${S}/doc/examples/* ${D}${docdir}/apt/examples/
 
 	install -d ${D}${includedir}/apt-pkg/
 	install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index e3ca6d0..83411a9 100644
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -18,8 +18,8 @@ inherit autotools gettext
 EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
 
 do_configure_prepend() {
-    rm -rf buildlib/config.sub
-    rm -rf buildlib/config.guess
+    rm -rf ${S}/buildlib/config.sub
+    rm -rf ${S}/buildlib/config.guess
 }
 
 # Apt wants to know the glibc version by running a binary file, which will
-- 
cgit v1.1