merge from gcc

diff --git a/intl/ChangeLog b/intl/ChangeLog
index dcb14fb3bbd52f5b225ef2b90e1968c54fc46a09..6c1c6eddf1b7a844543e6d984b73ff1ff51415e5 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.in (datarootdir): New variable.
+
 2008-04-18  Paolo Bonzini  <bonzini@gnu.org>
 
        PR bootstrap/35457

diff --git a/intl/Makefile.in b/intl/Makefile.in
index ca3814dc8512aee722f459ee156588c7f303d096..96211ffd14787850629e03f739f8b5376510bb49 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -31,6 +31,7 @@ exec_prefix = @exec_prefix@
 transform = @program_transform_name@
 libdir = @libdir@
 includedir = @includedir@
+datarootdir = @datarootdir@
 datadir = @datadir@
 localedir = $(datadir)/locale
 aliaspath = $(localedir)

diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index 153b6772f110b24057e816e486e05a42a84676eb..5a769201a52a155d0a7ecb2f4d6a9609673b7358 100644 (file)
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.in (datarootdir): New variable.
+
 2008-06-10  Joseph Myers  <joseph@codesourcery.com>
 
        * dconfig.h: New.

diff --git a/libdecnumber/Makefile.in b/libdecnumber/Makefile.in
index b17505902afcd4ca3e8f9cce74c3dca349109cd8..bdfbe435ed90bb0396edbd61873e064864de7f89 100644 (file)
--- a/libdecnumber/Makefile.in
+++ b/libdecnumber/Makefile.in
@@ -44,6 +44,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHELL = @SHELL@
 
+datarootdir = @datarootdir@
 datadir = @datadir@
 exec_prefix = @prefix@
 libdir = @libdir@