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

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 446e26a2cecd4cfd910b3b0c9cb5a0474a711aa4..834683f00cc5302ee8743f9fb696e000f60fa0fb 100644 (file)
--- 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 cbee426d1c8974b1a004f239bdaeb4353e7ffc01..77330edfb08297f1f5f511eed7b4fb366550640e 100644 (file)
--- 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 f4ff8e74cce006c5e6d8cefff83454d1f02cd2e6..2334366012779d5cd3cba4e07805d3f42e1fb03b 100644 (file)
--- 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 a41988b989b7e8c70455c9a4584a01e027719d32..5528f0bb3a2ef6abef0b2f288c5f7d4e6126e0ea 100644 (file)
--- 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 3922c5d192ad93235543c6c970403919a28b476a..66e202f7a7763b029e270bec329be617f20d1955 100644 (file)
--- 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 fc1e50409c2f3f4bc858bee3021f541461668542..93014beebfd0baaa028d3880ff27b80cad478d61 100644 (file)
--- 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 0d79b6944f29cb004d8e858a7c703cd7d7c00181..7261a6ee15472d82c7bb8e86004bf19e30f69453 100644 (file)
--- 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 07c8f453fcd763e829eb9dd947976605ff5445e3..dba3c7e4fee30b7529e89cdedcee643efcb81cf8 100644 (file)
--- 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 cbee426d1c8974b1a004f239bdaeb4353e7ffc01..77330edfb08297f1f5f511eed7b4fb366550640e 100644 (file)
--- 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 41c91486a198bfad98eeb7e2ab6b0a4f999a4e2e..e880104e43e72465c8c1090e4ed7fffbb3e81ccd 100644 (file)
--- 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 36f5a6c91aeaabb9446d34b2685bc756b31c6d44..f2d48eff7cf2c4a247bff1621850b3e941b0be7b 100644 (file)
--- 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@"