4 files changed, 5 insertions, 4 deletions

diff --git a/meta-extras/conf/layer.conf b/meta-extras/conf/layer.conf
index 1ba520a5a4..c992abc9f6 100644
--- a/meta-extras/conf/layer.conf
+++ b/meta-extras/conf/layer.conf
@@ -1,5 +1,5 @@
 # We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}${LAYERDIR}"
+BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a packages directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
diff --git a/meta-moblin/conf/layer.conf b/meta-moblin/conf/layer.conf
index 8f2c3c0cd4..b5daea69ed 100644
--- a/meta-moblin/conf/layer.conf
+++ b/meta-moblin/conf/layer.conf
@@ -1,5 +1,5 @@
 # We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}${LAYERDIR}"
+BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a packages directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
diff --git a/meta-openmoko/conf/layer.conf b/meta-openmoko/conf/layer.conf
index 1dadce0cb6..88f15b6db8 100644
--- a/meta-openmoko/conf/layer.conf
+++ b/meta-openmoko/conf/layer.conf
@@ -1,5 +1,5 @@
 # We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}${LAYERDIR}"
+BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a packages directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index a780245c29..d0d74884ec 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -1,5 +1,6 @@
+BBPATH ?= ""
 # We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}${LAYERDIR}"
+BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a packages directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"