From: Bruno Haible <bruno@clisp.org>
Date: Sat, 19 Sep 2009 14:58:23 +0000 (+0200)
Subject: Update recommended way to define localedir.
X-Git-Tag: v0.18~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24a0f11285009bc508b59b0c89e8b50221f28ca0;p=thirdparty%2Fgettext.git

Update recommended way to define localedir.
---

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index a78339b05..017622960 100644
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-20  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.texi (src/Makefile): Update recommendations for autoconf
+	versions >= 2.60.
+	Reported by Sylvain Beucler <beuc@gnu.org>
+	at <http://savannah.gnu.org/bugs/?27464>.
+
 2009-08-16  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am (dist-html-split): Depend on gettext_toc.html.
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 45f36f46e..b09bcbadb 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -8145,7 +8145,16 @@ textdomain (@var{PACKAGE});
 @end example
 
 To make LOCALEDIR known to the program, add the following lines to
-@file{Makefile.in}:
+@file{Makefile.in} if you are using Autoconf version 2.60 or newer:
+
+@example
+datadir = @@datadir@@
+datarootdir= @@datarootdir@@
+localedir = @@localedir@@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @@DEFS@@
+@end example
+
+or these lines if your version of Autoconf is older than 2.60:
 
 @example
 datadir = @@datadir@@
@@ -8221,8 +8230,9 @@ for each specific module or compilation unit, or
 AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
 @end example
 
-for all modules and compilation units together.  Furthermore, add this
-line to define @samp{localedir}:
+for all modules and compilation units together.  Furthermore, if you are
+using an Autoconf version older then 2.60, add this line to define
+@samp{localedir}:
 
 @example
 localedir = $(datadir)/locale