From 4f857db335de6935077d4866c51dd9d6851fed1d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 22 Feb 2005 12:53:55 +0000 Subject: 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 --- packages/faad2/faad2_2.0.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/faad2') diff --git a/packages/faad2/faad2_2.0.bb b/packages/faad2/faad2_2.0.bb index 883cabc3b5..244b2f66fa 100644 --- a/packages/faad2/faad2_2.0.bb +++ b/packages/faad2/faad2_2.0.bb @@ -14,13 +14,13 @@ S="${WORKDIR}/${PN}" PACKAGES = "${PN} libfaad libfaad-dev libmp4ff libmp4ff-dev" -FILES_${PN} = "/usr/bin/faad" +FILES_${PN} = "${bindir}/faad" -FILES_libfaad = "/usr/lib/libfaad.so.0 /usr/lib/libfaad.so.0.0.0" -FILES_libfaad-dev = "/usr/lib/libfaad.so /usr/lib/libfaad.la /usr/lib/libfaad.a /usr/include/faad.h" +FILES_libfaad = "${libdir}/libfaad.so.0 ${libdir}/libfaad.so.0.0.0" +FILES_libfaad-dev = "${libdir}/libfaad.so ${libdir}/libfaad.la ${libdir}/libfaad.a ${includedir}/faad.h" -FILES_libmp4ff = "/usr/lib/libmp4ff.so.0 /usr/lib/libmp4ff.so.0.0.0" -FILES_libmp4ff-dev = "/usr/lib/libmp4ff.so /usr/lib/libmp4ff.la /usr/lib/libmp4ff.a /usr/include/mp4ff.h" +FILES_libmp4ff = "${libdir}/libmp4ff.so.0 ${libdir}/libmp4ff.so.0.0.0" +FILES_libmp4ff-dev = "${libdir}/libmp4ff.so ${libdir}/libmp4ff.la ${libdir}/libmp4ff.a ${includedir}/mp4ff.h" do_stage() { oe_libinstall -a -so -C libfaad libfaad ${STAGING_LIBDIR} -- cgit 1.2.3-korg