From: Bruno Haible <bruno@clisp.org>
Date: Tue, 26 Jul 2005 18:39:50 +0000 (+0000)
Subject: In future versions of autoconf, @datadir@ = $(datarootdir).
X-Git-Tag: v0.15~455
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97078f20257cf4f154f024b014df19c6111518fb;p=thirdparty%2Fgettext.git

In future versions of autoconf, @datadir@ = $(datarootdir).
---

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 446e26a2c..834683f00 100644
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.in.in (datarootdir): New variable.
+	Suggested by Stepan Kasal <kasal@ucw.cz>.
+
 2005-03-13  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.in.in (Makefile): Call config.status with calling convention
diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index cbee426d1..77330edfb 100644
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -23,6 +23,7 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index f4ff8e74c..233436601 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-26  Bruno Haible  <bruno@clisp.org>
+
+	* installpaths.in (datarootdir): New variable.
+
 2005-07-16  Bruno Haible  <bruno@clisp.org>
 
 	* hello-c/m4/Makefile.am (EXTRA_DIST): Add lock.m4.
diff --git a/gettext-tools/examples/installpaths.in b/gettext-tools/examples/installpaths.in
index a41988b98..5528f0bb3 100644
--- a/gettext-tools/examples/installpaths.in
+++ b/gettext-tools/examples/installpaths.in
@@ -1,5 +1,6 @@
 prefix='@prefix@'
 exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
 datadir="@datadir@"
 docdir="@docdir@"
 ACLOCALDIR="@aclocaldir@"
diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 3922c5d19..66e202f7a 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26  Bruno Haible  <bruno@clisp.org>
+
+	* autopoint.in (datarootdir): New variable.
+	* gettextize.in (datarootdir): New variable.
+
 2005-07-16  Bruno Haible  <bruno@clisp.org>
 
 	* gettextize.in (m4filelist): Add lock.m4.
diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index fc1e50409..93014beeb 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -28,6 +28,7 @@ version=@VERSION@
 # Set variables
 # - gettext_dir     directory where the sources are stored.
 prefix="@prefix@"
+datarootdir="@datarootdir@"
 gettext_dir="@datadir@/gettext"
 
 # func_tmpdir
diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 0d79b6944..7261a6ee1 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -28,6 +28,7 @@ version=@VERSION@
 # Set variables
 # - gettext_dir     directory where the sources are stored.
 prefix="@prefix@"
+datarootdir="@datarootdir@"
 gettext_dir="@datadir@/gettext"
 
 # func_tmpdir
diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index 07c8f453f..dba3c7e4f 100644
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.in.in (datarootdir): New variable.
+	Suggested by Stepan Kasal <kasal@ucw.cz>.
+
 2005-03-13  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.in.in (Makefile): Call config.status with calling convention
diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in
index cbee426d1..77330edfb 100644
--- a/gettext-tools/po/Makefile.in.in
+++ b/gettext-tools/po/Makefile.in.in
@@ -23,6 +23,7 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 41c91486a..e880104e4 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-26  Bruno Haible  <bruno@clisp.org>
+
+	* user-email.sh.in (datarootdir): New variable.
+
 2005-07-26  Bruno Haible  <bruno@clisp.org>
 
 	Fix compilation error on systems without iconv().
diff --git a/gettext-tools/src/user-email.sh.in b/gettext-tools/src/user-email.sh.in
index 36f5a6c91..f2d48eff7 100644
--- a/gettext-tools/src/user-email.sh.in
+++ b/gettext-tools/src/user-email.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Prints the user's email address, with confirmation from the user.
 #
-# Copyright (C) 2001-2003 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 # Prerequisites for using @libdir@ and @localedir@.
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
 datadir="@datadir@"
 # Set variables libdir, localedir.
 libdir="@libdir@"