summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-17 12:18:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-18 12:13:44 +0100
commit9ecacde57dc80fb75dbe8be280a6b53e5d101d01 (patch)
tree082ba0abdfcbaa0e4130d074f38ee0e60cbc86ec /meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
parent2ddf822049ffd654539253d4912445f773f90dd0 (diff)
downloadpoky-9ecacde57dc80fb75dbe8be280a6b53e5d101d01.tar.gz
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>
Diffstat (limited to 'meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch')
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch20
1 files changed, 1 insertions, 19 deletions
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
index 60ee8ffed5..15c100c908 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
@@ -1,9 +1,5 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3#
4# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
5#
6
7--- console-tools-0.3.2/configure.in~configure 3--- console-tools-0.3.2/configure.in~configure
8+++ console-tools-0.3.2/configure.in 4+++ console-tools-0.3.2/configure.in
9@@ -2,13 +2,14 @@ 5@@ -2,13 +2,14 @@
@@ -23,25 +19,11 @@ Upstream-Status: Pending
23 AM_INIT_AUTOMAKE(console-tools, 0.3.2) 19 AM_INIT_AUTOMAKE(console-tools, 0.3.2)
24 20
25 # Defaults 21 # Defaults
26@@ -25,7 +26,7 @@ 22@@ -25,7 +26,6 @@
27 # i18n stuff 23 # i18n stuff
28 ALL_LINGUAS="cs de ru ga fr" 24 ALL_LINGUAS="cs de ru ga fr"
29 AM_GNU_GETTEXT 25 AM_GNU_GETTEXT
30-AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) 26-AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
31+AC_CONFIG_COMMANDS([default-1],[[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]],[[]])
32 27
33 AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale") 28 AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale")
34 29
35@@ -172,10 +173,11 @@
36 AC_SUBST(CHARMAPDIR)
37
38 # Output
39-AC_OUTPUT([Makefile lib/Makefile lib/console/Makefile lib/cfont/Makefile
40+AC_CONFIG_FILES([Makefile lib/Makefile lib/console/Makefile lib/cfont/Makefile
41 lib/ctutils/Makefile lib/ctlocal/Makefile lib/generic/Makefile
42 fontfiletools/Makefile vttools/Makefile
43 kbdtools/Makefile screenfonttools/Makefile contrib/Makefile
44 include/Makefile include/lct/Makefile compat/Makefile
45 doc/Makefile doc/man/Makefile examples/Makefile
46 po/Makefile.in intl/Makefile])
47+AC_OUTPUT