From: Bruno Haible Date: Thu, 20 Apr 2006 15:18:04 +0000 (+0000) Subject: Don't ignore the --localedir option from autoconf >= 2.60. X-Git-Tag: v0.15~220 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1c3ed13fc9863b3e7733e3c62cbccd9af24860a;p=thirdparty%2Fgettext.git Don't ignore the --localedir option from autoconf >= 2.60. --- diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 91d03d91d..ab7ff4ff4 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,8 +1,13 @@ +2006-04-14 Bruno Haible + + Prepare for autoconf-2.60. + * po.m4 (AM_PO_SUBDIRS): Set localedir if not already defined. + 2006-02-21 Bruno Haible * gettext.m4 (AM_GNU_GETTEXT): Invoke AM_NLS through AC_REQUIRE, not directly. - Reported by Ron . + Reported by Ron Lee . 2005-11-21 Bruno Haible diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4 index ac47bbc76..60bfc459b 100644 --- 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 712fd9cd8..709de5748 100644 --- a/gettext-runtime/po/ChangeLog +++ b/gettext-runtime/po/ChangeLog @@ -1,3 +1,9 @@ +2006-04-14 Bruno Haible + + 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 * es.po: Update from Max de Mendizábal . diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in index f22cf9043..0fd707235 100644 --- 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 +# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper # # 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 075847a67..662cd1545 100644 --- a/gettext-tools/examples/ChangeLog +++ b/gettext-tools/examples/ChangeLog @@ -1,3 +1,29 @@ +2006-04-14 Bruno Haible + + 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 * 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 28485dab7..c6075a103 100644 --- 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 4f3a42294..7a0b3c0d6 100644 --- 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 5cdeceb44..da9105095 100644 --- 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 53f998a65..afe2e3fd6 100644 --- 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 c2a5a6157..970132f63 100644 --- 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 fc50ca01c..2ff4aa0d3 100644 --- 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 4dc19ff92..75b3dba23 100644 --- 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 a7c1fade5..1247e98bd 100644 --- 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 bf252b076..81d39da6d 100644 --- 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 5e7d65f7a..9e42322fb 100644 --- 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 90aa8f2e5..71d6c7a46 100644 --- 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 e9a494250..27d04636e 100644 --- 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 b07344038..1ef02b2e9 100644 --- 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 99d1ee840..06c324093 100644 --- 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 feaad5cfa..1f7a02910 100644 --- 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 b68f91a2c..5650993d5 100644 --- 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 b86652c1d..0881bc3d9 100644 --- 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 612aaba81..4bb912051 100644 --- 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 be1c2d329..f846f7721 100644 --- 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 b9e4b08cf..2f53ab8be 100644 --- 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 8da92a411..13b8508f7 100644 --- 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 c15bb1857..21df9927d 100644 --- 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 d30f35dc5..bcee7f79a 100644 --- a/gettext-tools/po/ChangeLog +++ b/gettext-tools/po/ChangeLog @@ -1,3 +1,9 @@ +2006-04-14 Bruno Haible + + 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 * ca.po: Update from Ivan Vilata i Balaguer . diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in index f22cf9043..0fd707235 100644 --- 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 +# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper # # 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@