2 files changed, 9 insertions, 7 deletions

diff --git a/meta/classes/lib_package.bbclass b/meta/classes/lib_package.bbclass
index 9843ed9f4c..1f0542a4ca 100644
--- a/meta/classes/lib_package.bbclass
+++ b/meta/classes/lib_package.bbclass
@@ -1,8 +1,8 @@
-PACKAGES =+ "${PN}-bin"
+#
+# ${PN}-bin is defined in bitbake.conf
+#
+# We need to allow the other packages to be greedy with what they
+# want out of /bin and /usr/bin before ${PN}-bin gets greedy.
+# 
+PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PN}-bin ${PN}"
 
-FILES_${PN} = "${libexecdir} ${libdir}/lib*${SOLIBS} \
-            ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-            ${base_libdir}/*${SOLIBS} \
-            ${datadir}/${BPN} ${libdir}/${BPN}"
-
-FILES_${PN}-bin = "${bindir}/* ${sbindir}/* /bin/* /sbin/*"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e0727578e2..face25e80c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -266,6 +266,8 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS}
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
             ${libdir}/bonobo/servers"
 
+FILES_${PN}-bin = "${bindir}/* ${sbindir}/*"
+
 FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
             ${datadir}/gnome/help"
 SECTION_${PN}-doc = "doc"