9ecacde57d
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>
30 lines
811 B
Diff
30 lines
811 B
Diff
Upstream-Status: Pending
|
|
|
|
--- console-tools-0.3.2/configure.in~configure
|
|
+++ console-tools-0.3.2/configure.in
|
|
@@ -2,13 +2,14 @@
|
|
dnl Process this file with autoconf to produce a configure script.
|
|
|
|
# Initialize
|
|
-AC_INIT(kbdtools/loadkeys.y)
|
|
+AC_INIT
|
|
+AC_CONFIG_SRCDIR([kbdtools/loadkeys.y])
|
|
|
|
define(ct_unicodedata_default,/usr/share/unidata/UnicodeData-2.txt)
|
|
ct_localdatadir_default=/usr/local/share # iff --enable-localdatadir without specific dir
|
|
|
|
#AC_CONFIG_AUX_DIR(autoconf)
|
|
-AC_CANONICAL_SYSTEM
|
|
+AC_CANONICAL_TARGET([])
|
|
AM_INIT_AUTOMAKE(console-tools, 0.3.2)
|
|
|
|
# Defaults
|
|
@@ -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_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale")
|
|
|