From 9ecacde57dc80fb75dbe8be280a6b53e5d101d01 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 17 Oct 2012 12:18:12 +0000 Subject: console-tools: Clean up recipe This cleans up various bits of nastiness in this recipe: * Drop unneeded m4 macros * Update to a recent version of gettext (needs addition of Makevars file) * Drop split do_compile and SUBDIRS hacks, just patch out the docs * Remove some of the configure.in hacks since they seem unneeded now and break gettext (the AC_OUTPUT change). * Wipe out acinclude.m4 since it has corrisive contents (From OE-Core rev: 87a9a3b3b2603516704a38fccc8c396e547ac101) Signed-off-by: Richard Purdie --- .../recipes-core/console-tools/console-tools_0.3.2.bb | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'meta/recipes-core/console-tools/console-tools_0.3.2.bb') diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb index 8bcc90a868..d62c0bd069 100644 --- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb +++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb @@ -11,23 +11,18 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ file://compile.patch \ file://kbdrate.patch \ file://uclibc-fileno.patch \ - file://config" + file://nodocs.patch \ + file://lcmessage.m4 \ + file://Makevars" SRC_URI[md5sum] = "bf21564fc38b3af853ef724babddbacd" SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1c126c2" -export SUBDIRS = "fontfiletools vttools kbdtools screenfonttools contrib \ - examples po intl compat" - -acpaths = "-I config" do_configure_prepend () { - mkdir -p config - cp ${WORKDIR}/config/*.m4 config/ -} - -do_compile () { - oe_runmake -C lib - oe_runmake 'SUBDIRS=${SUBDIRS}' + mkdir -p ${S}/m4 + cp ${WORKDIR}/lcmessage.m4 ${S}/m4/ + rm -f ${S}/acinclude.m4 + cp ${WORKDIR}/Makevars ${S}/po/ } inherit autotools gettext update-alternatives -- cgit v1.2.3-54-g00ecf