diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
| commit | 4f857db335de6935077d4866c51dd9d6851fed1d (patch) | |
| tree | 1c923be071d1a56bd79f467fd75ac77959a493a3 /packages/xfonts | |
| parent | b32403d57d7e0473dd336e76f95c7b26f113cf26 (diff) | |
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
Diffstat (limited to 'packages/xfonts')
| -rw-r--r-- | packages/xfonts/xfonts-xorg_6.8.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/xfonts/xfonts-xorg_6.8.bb b/packages/xfonts/xfonts-xorg_6.8.bb index ed797b3103..8637e82b97 100644 --- a/packages/xfonts/xfonts-xorg_6.8.bb +++ b/packages/xfonts/xfonts-xorg_6.8.bb @@ -8,12 +8,12 @@ SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;tag=XORG-6_8_0;m inherit native PACKAGES = "${PN}-75dpi ${PN}-100dpi ${PN}-type1 ${PN}-cyrillic ${PN}-ttf ${PN}" -FILES_${PN}-75dpi = "/usr/lib/X11/fonts/75dpi" -FILES_${PN}-100dpi = "/usr/lib/X11/fonts/100dpi" -FILES_${PN}-type1 = "/usr/lib/X11/fonts/Type1" -FILES_${PN}-ttf = "/usr/lib/X11/fonts/TTF" -FILES_${PN}-cyrillic = "/usr/lib/X11/fonts/cyrillic" -FILES_${PN} = "/usr/lib/X11/fonts" +FILES_${PN}-75dpi = "${libdir}/X11/fonts/75dpi" +FILES_${PN}-100dpi = "${libdir}/X11/fonts/100dpi" +FILES_${PN}-type1 = "${libdir}/X11/fonts/Type1" +FILES_${PN}-ttf = "${libdir}/X11/fonts/TTF" +FILES_${PN}-cyrillic = "${libdir}/X11/fonts/cyrillic" +FILES_${PN} = "${libdir}/X11/fonts" PACKAGE_ARCH = "all" |