Don't ignore the --localedir option from autoconf >= 2.60.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 91d03d91ddb70ab18c7f53a8b6a8cde81d1cc806..ab7ff4ff449756248d835f8feb346cc78286de4f 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,8 +1,13 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Prepare for autoconf-2.60.
+       * po.m4 (AM_PO_SUBDIRS): Set localedir if not already defined.
+
 2006-02-21  Bruno Haible  <bruno@clisp.org>
 
        * gettext.m4 (AM_GNU_GETTEXT): Invoke AM_NLS through AC_REQUIRE, not
        directly.
-       Reported by Ron <ron@debian.org>.
+       Reported by Ron Lee <ron@debian.org>.
 
 2005-11-21  Bruno Haible  <bruno@clisp.org>
 

diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index ac47bbc765cadb2a7aa8e9f75a65ad6211ac8ba5..60bfc459b64360635b3a302b066f1e41c0a409e2 100644 (file)
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,5 +1,5 @@
-# po.m4 serial 10 (gettext-0.15)
-dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
+# po.m4 serial 11 (gettext-0.15)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -78,6 +78,12 @@ changequote([,])dnl
   AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
     [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
 
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST([localedir])
+
   AC_CONFIG_COMMANDS([po-directories], [[
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 712fd9cd8c649637ac01c3cd2da460aaa5e4e7f2..709de5748127c90cd1d553b349e8579f5129fcbc 100644 (file)
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Don't ignore the --localedir option from autoconf >= 2.60.
+       * Makefile.in.in (localedir): Set to the value determined by the
+       configure script.
+
 2006-04-07  Bruno Haible  <bruno@clisp.org>
 
        * es.po: Update from Max de Mendizábal <max@upn.mx>.

diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index f22cf90431c8d15d8bb639d978fc6cf8c8691e8f..0fd707235fbab6d2a99ecec855188a213c5ca3e6 100644 (file)
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
@@ -25,7 +25,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 075847a679dd0904c89b37299946c0a5ecb854fa..662cd1545c748c2fd1436c8a35e8730e0521491e 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,29 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Don't ignore the --localedir option from autoconf >= 2.60.
+       * hello-c/Makefile.am (localedir): Remove variable.
+       * hello-c-gnome/Makefile.am (localedir): Likewise.
+       * hello-objc/Makefile.am (localedir): Likewise.
+       * hello-objc-gnome/Makefile.am (localedir): Likewise.
+       * hello-c++/Makefile.am (localedir): Likewise.
+       * hello-c++-kde/Makefile.am (localedir): Likewise.
+       * hello-c++-gnome/Makefile.am (localedir): Likewise.
+       * hello-c++-qt/Makefile.am (localedir): Likewise.
+       * hello-c++-qt/po/Makefile.am (localedir): Likewise.
+       * hello-c++-wxwidgets/Makefile.am (localedir): Likewise.
+       * hello-c++-wxwidgets/po/Makefile.am (localedir): Likewise.
+       * hello-clisp/po/Makefile.am (localedir): Likewise.
+       * hello-gawk/po/Makefile.am (localedir): Likewise.
+       * hello-guile/po/Makefile.am (localedir): Likewise.
+       * hello-librep/po/Makefile.am (localedir): Likewise.
+       * hello-pascal/po/Makefile.am (localedir): Likewise.
+       * hello-perl/po/Makefile.am (localedir): Likewise.
+       * hello-php/po/Makefile.am (localedir): Likewise.
+       * hello-python/po/Makefile.am (localedir): Likewise.
+       * hello-sh/po/Makefile.am (localedir): Likewise.
+       * hello-smalltalk/po/Makefile.am (localedir): Likewise.
+       * hello-ycp/po/Makefile.am (localedir): Likewise.
+
 2006-04-14  Bruno Haible  <bruno@clisp.org>
 
        * hello-c/configure.ac: Use gettext-0.15 infrastructure.

diff --git a/gettext-tools/examples/hello-c++-gnome/Makefile.am b/gettext-tools/examples/hello-c++-gnome/Makefile.am
index 28485dab7adcfaa6a255696c4ecebefcaabefeb6..c6075a1033de8e602f0386edbb6f12bc0a379d6f 100644 (file)
--- a/gettext-tools/examples/hello-c++-gnome/Makefile.am
+++ b/gettext-tools/examples/hello-c++-gnome/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -18,7 +18,6 @@ bin_PROGRAMS = hello
 hello_SOURCES = hello.cc
 
 # Define a C macro LOCALEDIR indicating where catalogs will be installed.
-localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gnome.h include file is found.

diff --git a/gettext-tools/examples/hello-c++-kde/Makefile.am b/gettext-tools/examples/hello-c++-kde/Makefile.am
index 4f3a422942a8415ac704eabead82d383857fc7b6..7a0b3c0d6f2a80e6b498553eb170a3a23427a9e3 100644 (file)
--- a/gettext-tools/examples/hello-c++-kde/Makefile.am
+++ b/gettext-tools/examples/hello-c++-kde/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -21,7 +21,6 @@ hello_SOURCES = hello.cc hellowindow.cc
 METASOURCES = AUTO
 
 # Define a C macro LOCALEDIR indicating where catalogs will be installed.
-localedir = $(datadir)/locale
 DEFS = -DPREFIX=\"$(prefix)\" @DEFS@
 
 # Make sure the KDE, Qt, X include file is found.

diff --git a/gettext-tools/examples/hello-c++-qt/Makefile.am b/gettext-tools/examples/hello-c++-qt/Makefile.am
index 5cdeceb44d113a5cc196541c215455cfd60bdf1f..da9105095de9ebe048bbe674f99dc0d4c4108ef6 100644 (file)
--- a/gettext-tools/examples/hello-c++-qt/Makefile.am
+++ b/gettext-tools/examples/hello-c++-qt/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -19,7 +19,6 @@ hello_SOURCES = hello.cc
 
 # Define C macros LOCALEDIR and PKGLOCALEDIR indicating where catalogs will be
 # installed.
-localedir = $(datadir)/locale
 pkglocaledir = $(pkgdatadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DPKGLOCALEDIR=\"$(pkglocaledir)\" @DEFS@
 

diff --git a/gettext-tools/examples/hello-c++-qt/po/Makefile.am b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
index 53f998a6597f9371ab0355a407234024c5e8e87f..afe2e3fd6ce23197c51b9ccf95bc007e61b26606 100644 (file)
--- a/gettext-tools/examples/hello-c++-qt/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -47,8 +47,6 @@ COPYRIGHT_HOLDER = Yoyodyne, Inc.
 # which the translators can contact you.
 MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-c++-wxwidgets/Makefile.am b/gettext-tools/examples/hello-c++-wxwidgets/Makefile.am
index c2a5a61571448e5b545e61d80f9dcd54ac9966a2..970132f63d2d47ed09ef528d6d7a885e4858f4e0 100644 (file)
--- a/gettext-tools/examples/hello-c++-wxwidgets/Makefile.am
+++ b/gettext-tools/examples/hello-c++-wxwidgets/Makefile.am
@@ -18,7 +18,6 @@ bin_PROGRAMS = hello
 hello_SOURCES = hello.cc
 
 # Define a C macro LOCALEDIR indicating where catalogs will be installed.
-localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 CPPFLAGS += $(WX_CPPFLAGS)

diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
index fc50ca01cdf642a07aa8ba425dc27c8da5022867..2ff4aa0d326c98eb67d26846e62d1d0ff069b0b1 100644 (file)
--- a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
@@ -50,8 +50,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-c++/Makefile.am b/gettext-tools/examples/hello-c++/Makefile.am
index 4dc19ff92971de9cf2d69404637dd86f7e1bfc8f..75b3dba23b14636e509e4cf1547ccde04ff4fbdf 100644 (file)
--- a/gettext-tools/examples/hello-c++/Makefile.am
+++ b/gettext-tools/examples/hello-c++/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -18,7 +18,6 @@ bin_PROGRAMS = hello
 hello_SOURCES = hello.cc gettext.h
 
 # Define a C macro LOCALEDIR indicating where catalogs will be installed.
-localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gettext.h include file is found.

diff --git a/gettext-tools/examples/hello-c-gnome/Makefile.am b/gettext-tools/examples/hello-c-gnome/Makefile.am
index a7c1fade5ce8425a0e58687688964d89ee9a8db1..1247e98bdc85a84ef1c397fc499b945930bab294 100644 (file)
--- a/gettext-tools/examples/hello-c-gnome/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -18,7 +18,6 @@ bin_PROGRAMS = hello
 hello_SOURCES = hello.c
 
 # Define a C macro LOCALEDIR indicating where catalogs will be installed.
-localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gnome.h include file is found.

diff --git a/gettext-tools/examples/hello-c/Makefile.am b/gettext-tools/examples/hello-c/Makefile.am
index bf252b0767fa03e7b668cc504d9aae0170684550..81d39da6dc7b99a3fd84c329b6b9f089968e77f8 100644 (file)
--- a/gettext-tools/examples/hello-c/Makefile.am
+++ b/gettext-tools/examples/hello-c/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -18,7 +18,6 @@ bin_PROGRAMS = hello
 hello_SOURCES = hello.c gettext.h
 
 # Define a C macro LOCALEDIR indicating where catalogs will be installed.
-localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gettext.h include file is found.

diff --git a/gettext-tools/examples/hello-clisp/po/Makefile.am b/gettext-tools/examples/hello-clisp/po/Makefile.am
index 5e7d65f7a34ccdc56b739a2abc43ac757ebb0918..9e42322fb6a2011db4fceb7fc6ba75d320060557 100644 (file)
--- a/gettext-tools/examples/hello-clisp/po/Makefile.am
+++ b/gettext-tools/examples/hello-clisp/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -44,8 +44,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-gawk/po/Makefile.am b/gettext-tools/examples/hello-gawk/po/Makefile.am
index 90aa8f2e5306b3d76c179dba33f1d5c3e46e5496..71d6c7a46c21c6ee511f113f28eec654a12f09ae 100644 (file)
--- a/gettext-tools/examples/hello-gawk/po/Makefile.am
+++ b/gettext-tools/examples/hello-gawk/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -44,8 +44,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-guile/po/Makefile.am b/gettext-tools/examples/hello-guile/po/Makefile.am
index e9a4942500b9dddcfaa07a64da4fadea8cec5c87..27d04636e46e2a721e5e594d70506071da6e7301 100644 (file)
--- a/gettext-tools/examples/hello-guile/po/Makefile.am
+++ b/gettext-tools/examples/hello-guile/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -44,8 +44,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-librep/po/Makefile.am b/gettext-tools/examples/hello-librep/po/Makefile.am
index b07344038fb3bdb5d95a459015ea6afbffd6097f..1ef02b2e91a133463acc15e7903225391ffc66c6 100644 (file)
--- a/gettext-tools/examples/hello-librep/po/Makefile.am
+++ b/gettext-tools/examples/hello-librep/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -44,8 +44,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-objc-gnome/Makefile.am b/gettext-tools/examples/hello-objc-gnome/Makefile.am
index 99d1ee8404e2c2e6343503dd008bb3254e2e598c..06c32409391db35b2571c74bd80444945bfa2e7d 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnome/Makefile.am
+++ b/gettext-tools/examples/hello-objc-gnome/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -18,7 +18,6 @@ bin_PROGRAMS = hello
 hello_SOURCES = hello.m
 
 # Define a C macro LOCALEDIR indicating where catalogs will be installed.
-localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gnome.h include file is found.

diff --git a/gettext-tools/examples/hello-objc/Makefile.am b/gettext-tools/examples/hello-objc/Makefile.am
index feaad5cfa44eb3488ee71f6b7a09cd3d1d5fa8ef..1f7a0291070f421476311fce1ba9c6e392b6e6f1 100644 (file)
--- a/gettext-tools/examples/hello-objc/Makefile.am
+++ b/gettext-tools/examples/hello-objc/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -18,7 +18,6 @@ bin_PROGRAMS = hello
 hello_SOURCES = hello.m gettext.h
 
 # Define a C macro LOCALEDIR indicating where catalogs will be installed.
-localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gettext.h include file is found.

diff --git a/gettext-tools/examples/hello-pascal/po/Makefile.am b/gettext-tools/examples/hello-pascal/po/Makefile.am
index b68f91a2cb96b4748d6c249ecb17a4b4293e059f..5650993d55792cbaed5c4af686fbdf3bef3f1b58 100644 (file)
--- a/gettext-tools/examples/hello-pascal/po/Makefile.am
+++ b/gettext-tools/examples/hello-pascal/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -44,8 +44,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-perl/po/Makefile.am b/gettext-tools/examples/hello-perl/po/Makefile.am
index b86652c1d94d27f29ca1ce5591bb1f66d2d0e527..0881bc3d91ed397538d2f365ccc154d48e2a0f33 100644 (file)
--- a/gettext-tools/examples/hello-perl/po/Makefile.am
+++ b/gettext-tools/examples/hello-perl/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -54,8 +54,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-php/po/Makefile.am b/gettext-tools/examples/hello-php/po/Makefile.am
index 612aaba81e75cba3d62475b2337c42ff85bbd11f..4bb9120512fbcc0b9b3b3942c90e477d016da0b2 100644 (file)
--- a/gettext-tools/examples/hello-php/po/Makefile.am
+++ b/gettext-tools/examples/hello-php/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -44,8 +44,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-python/po/Makefile.am b/gettext-tools/examples/hello-python/po/Makefile.am
index be1c2d32947b815e144e673e26a28164759e6d5a..f846f772112fcb3530e39c0fbc772b9ab73d57ed 100644 (file)
--- a/gettext-tools/examples/hello-python/po/Makefile.am
+++ b/gettext-tools/examples/hello-python/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -44,8 +44,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-sh/po/Makefile.am b/gettext-tools/examples/hello-sh/po/Makefile.am
index b9e4b08cfcbeda1fc63c50d5449d457a4c7d5012..2f53ab8bee4fe5c6134ccbd53a8b0e13b9952e06 100644 (file)
--- a/gettext-tools/examples/hello-sh/po/Makefile.am
+++ b/gettext-tools/examples/hello-sh/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -44,8 +44,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-smalltalk/po/Makefile.am b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
index 8da92a411cfc63f03da2519908d36e5e44e11700..13b8508f7044594ae606b65c96ef6c995741f8ba 100644 (file)
--- a/gettext-tools/examples/hello-smalltalk/po/Makefile.am
+++ b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -44,8 +44,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/examples/hello-ycp/po/Makefile.am b/gettext-tools/examples/hello-ycp/po/Makefile.am
index c15bb1857f71bfaee121e4c0d33ef036f0ba6d66..21df9927d73522c3742ef8d2071153dfed9be977 100644 (file)
--- a/gettext-tools/examples/hello-ycp/po/Makefile.am
+++ b/gettext-tools/examples/hello-ycp/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -44,8 +44,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = @localedir@
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index d30f35dc57f0a9b7d316314edb723dbb84692cf1..bcee7f79a601011f74d75bb6562a0133249890ce 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Don't ignore the --localedir option from autoconf >= 2.60.
+       * Makefile.in.in (localedir): Set to the value determined by the
+       configure script.
+
 2006-04-07  Bruno Haible  <bruno@clisp.org>
 
        * ca.po: Update from Ivan Vilata i Balaguer <ivan@selidor.net>.

diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in
index f22cf90431c8d15d8bb639d978fc6cf8c8691e8f..0fd707235fbab6d2a99ecec855188a213c5ca3e6 100644 (file)
--- a/gettext-tools/po/Makefile.in.in
+++ b/gettext-tools/po/Makefile.in.in
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
@@ -25,7 +25,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@