Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/21 17:35:27-06:00 ti.com!kergoth
Kill the ipkg paths patch, since its busted.

2005/02/21 17:33:13-06:00 ti.com!kergoth
Fix sbindir in native.bbclass and cross.bbclass.  Thanks to Jordan Crouse for reporting.

2005/02/21 17:13:19-06:00 ti.com!kergoth
Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit.

2005/02/21 17:09:46-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/02/21 17:09:03-06:00 ti.com!kergoth
Run a sed script against our packages to fix some hardcoded target path
references.  As always when I do things like this, if packages you maintain
were touched by this, please do a sanity check to ensure the sed script didn't
run wild.

2005/02/21 15:49:47-06:00 ti.com!kergoth
Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO.

BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg

2 files changed, 16 insertions, 16 deletions

diff --git a/packages/mplayer/mplayer_1.0pre3try2.bb b/packages/mplayer/mplayer_1.0pre3try2.bb
index e227eb3664..f22b7a23e6 100644
--- a/packages/mplayer/mplayer_1.0pre3try2.bb
+++ b/packages/mplayer/mplayer_1.0pre3try2.bb
@@ -19,16 +19,16 @@ S = "${WORKDIR}/MPlayer-${PV}"
 
 PACKAGES =+ "postproc postproc-dev"
 
-FILES_${PN} = "/usr/bin/mplayer /usr/lib/mplayer/vidix/w100_vid.so"
+FILES_${PN} = "${bindir}/mplayer ${libdir}/mplayer/vidix/w100_vid.so"
 
-FILES_postproc = " /usr/lib/libpostproc.so.0.0.0 /usr/lib/libpostproc.so.0"
-FILES_postproc-dev = " /usr/include/postproc/postprocess.h /usr/lib/libpostproc.so /usr/lib/libpostproc.a"
+FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0"
+FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a"
 
 inherit autotools 
 
 EXTRA_OECONF = " \
         --prefix=/usr \
-		--mandir=/usr/share/man \
+		--mandir=${mandir} \
         --target=${TARGET_ARCH} \
         --enable-shared-pp \
         \
@@ -64,11 +64,11 @@ do_configure() {
 }
 
 do_install_append () {
-        install -d ${D}/${libdir} ${D}/usr/include ${D}/usr/include/postproc
-        install -m 0644 libavcodec/libpostproc/postprocess.h ${D}/usr/include/postproc/
+        install -d ${D}/${libdir} ${D}${includedir} ${D}${includedir}/postproc
+        install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/
         oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}/${libdir}
-        cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}/usr/lib/libpostproc.so.0.0.0
-        cd ${D}/usr/lib
+        cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0
+        cd ${D}${libdir}
         ln -sf libpostproc.so.0.0.0 libpostproc.so.0
         ln -sf libpostproc.so.0 libpostproc.so
 }
diff --git a/packages/mplayer/mplayer_1.0pre6.bb b/packages/mplayer/mplayer_1.0pre6.bb
index 95c44961a4..5dd6702e48 100644
--- a/packages/mplayer/mplayer_1.0pre6.bb
+++ b/packages/mplayer/mplayer_1.0pre6.bb
@@ -21,16 +21,16 @@ S = "${WORKDIR}/MPlayer-${PV}"
 
 PACKAGES =+ "postproc postproc-dev"
 
-FILES_${PN} = "/usr/bin/mplayer /usr/lib/mplayer/vidix/w100_vid.so"
+FILES_${PN} = "${bindir}/mplayer ${libdir}/mplayer/vidix/w100_vid.so"
 
-FILES_postproc = " /usr/lib/libpostproc.so.0.0.0 /usr/lib/libpostproc.so.0"
-FILES_postproc-dev = " /usr/include/postproc/postprocess.h /usr/lib/libpostproc.so /usr/lib/libpostproc.a"
+FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0"
+FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a"
 
 inherit autotools 
 
 EXTRA_OECONF = " \
         --prefix=/usr \
-		--mandir=/usr/share/man \
+		--mandir=${mandir} \
         --target=${TARGET_ARCH} \
         --enable-shared-pp \
         \
@@ -67,11 +67,11 @@ do_configure() {
 }
 
 do_install_append () {
-        install -d ${D}/${libdir} ${D}/usr/include ${D}/usr/include/postproc
-        install -m 0644 libavcodec/libpostproc/postprocess.h ${D}/usr/include/postproc/
+        install -d ${D}/${libdir} ${D}${includedir} ${D}${includedir}/postproc
+        install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/
         oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}/${libdir}
-        cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}/usr/lib/libpostproc.so.0.0.0
-        cd ${D}/usr/lib
+        cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0
+        cd ${D}${libdir}
         ln -sf libpostproc.so.0.0.0 libpostproc.so.0
         ln -sf libpostproc.so.0 libpostproc.so
 }