2009-11-25 Felix Zielcke <fzielcke@z-51.de>

	autoconf >= 2.60 support $(localedir).

	* INSTALL: Note that autoconf 2.60 is required.
	* configure.ac (AC_PREREQ): Bump to 2.60.
	* util/grub.d/10_kfreebsd.in (TEXTDOMAINDIR): Set to lowercased @localedir@.
	* util/grub.d/10_linux.in (TEXTDOMAINDIR): Likewise.

diff --git a/ChangeLog b/ChangeLog
index b2e8ad37bc608ad33eb3c0102125a028cd33c49f..2b5b05425ac4c17a06690353714652671f93fde1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-25  Felix Zielcke  <fzielcke@z-51.de>
+
+       autoconf >= 2.60 support $(localedir).
+
+       * INSTALL: Note that autoconf 2.60 is required.
+       * configure.ac (AC_PREREQ): Bump to 2.60.
+       * util/grub.d/10_kfreebsd.in (TEXTDOMAINDIR): Set to lowercased @localedir@.
+       * util/grub.d/10_linux.in (TEXTDOMAINDIR): Likewise.
+
 2009-11-25  Yves Blusseau  <yves.blusseau@zetam.org>
 
        * configure.ac: move the call to AM_GNU_GETTEXT to avoid warnings when

diff --git a/INSTALL b/INSTALL
index e7f9e89368837a6b5a095edff61296d57d947b47..cfade202633ef05766d044f24cd1348d7254fdf6 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -22,7 +22,7 @@ need the following.
 
 * Ruby 1.6 or later
 * Python 2.5.2 or later
-* Autoconf 2.59d or later
+* Autoconf 2.60 or later
 * Automake 1.10.1 or later
 
 Configuring the GRUB

diff --git a/configure.ac b/configure.ac
index 0a76c7b518168cd82851cf354ac81fae46d61453..08667d976a9eed190dc5e8ae9fe06d6db7da3fe0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ dnl type.
 
 AC_INIT([GRUB],[1.97],[bug-grub@gnu.org])
 AM_INIT_AUTOMAKE()
-AC_PREREQ(2.59d)
+AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR([include/grub/dl.h])
 AC_CONFIG_HEADER([config.h])
 

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index c6712e32fe1cbf8ca23c5f5892715f87fa659710..417fc93e3e8fe94f1f5e82ac887a6b6c4d09e858 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -24,7 +24,7 @@ libdir=@libdir@
 
 . ${bindir}/gettext.sh
 export TEXTDOMAIN=@PACKAGE@
-export TEXTDOMAINDIR=@LOCALEDIR@
+export TEXTDOMAINDIR=@localedir@
 
 case "${GRUB_DISTRIBUTOR}" in
   Debian)      OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD" ;;

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 8803055cfcdb66100c2a59138315726983d925d3..36a9fd9ea90e2d7f1867a7d9cf67e85b2b49163c 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -24,7 +24,7 @@ libdir=@libdir@
 
 . ${bindir}/gettext.sh
 export TEXTDOMAIN=@PACKAGE@
-export TEXTDOMAINDIR=@LOCALEDIR@
+export TEXTDOMAINDIR=@localedir@
 
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux