mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1,9 +1,5 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
#
|
||||
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
#
|
||||
|
||||
--- console-tools-0.3.2/configure.in~configure
|
||||
+++ console-tools-0.3.2/configure.in
|
||||
@@ -2,13 +2,14 @@
|
||||
@@ -23,25 +19,11 @@ Upstream-Status: Pending
|
||||
AM_INIT_AUTOMAKE(console-tools, 0.3.2)
|
||||
|
||||
# Defaults
|
||||
@@ -25,7 +26,7 @@
|
||||
@@ -25,7 +26,6 @@
|
||||
# i18n stuff
|
||||
ALL_LINGUAS="cs de ru ga fr"
|
||||
AM_GNU_GETTEXT
|
||||
-AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
|
||||
+AC_CONFIG_COMMANDS([default-1],[[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]],[[]])
|
||||
|
||||
AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale")
|
||||
|
||||
@@ -172,10 +173,11 @@
|
||||
AC_SUBST(CHARMAPDIR)
|
||||
|
||||
# Output
|
||||
-AC_OUTPUT([Makefile lib/Makefile lib/console/Makefile lib/cfont/Makefile
|
||||
+AC_CONFIG_FILES([Makefile lib/Makefile lib/console/Makefile lib/cfont/Makefile
|
||||
lib/ctutils/Makefile lib/ctlocal/Makefile lib/generic/Makefile
|
||||
fontfiletools/Makefile vttools/Makefile
|
||||
kbdtools/Makefile screenfonttools/Makefile contrib/Makefile
|
||||
include/Makefile include/lct/Makefile compat/Makefile
|
||||
doc/Makefile doc/man/Makefile examples/Makefile
|
||||
po/Makefile.in intl/Makefile])
|
||||
+AC_OUTPUT
|
||||
|
||||
Reference in New Issue
Block a user