From a8a7f348f4dc70b6c65cb2f1f061c64dd703c308 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 16 Jun 2008 18:15:49 +0000 Subject: merge from gcc --- intl/ChangeLog | 4 ++++ intl/Makefile.in | 1 + libdecnumber/ChangeLog | 4 ++++ libdecnumber/Makefile.in | 1 + 4 files changed, 10 insertions(+) diff --git a/intl/ChangeLog b/intl/ChangeLog index dcb14fb3bbd..6c1c6eddf1b 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,7 @@ +2008-06-16 Ralf Wildenhues + + * Makefile.in (datarootdir): New variable. + 2008-04-18 Paolo Bonzini PR bootstrap/35457 diff --git a/intl/Makefile.in b/intl/Makefile.in index ca3814dc851..96211ffd147 100644 --- 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 153b6772f11..5a769201a52 100644 --- a/libdecnumber/ChangeLog +++ b/libdecnumber/ChangeLog @@ -1,3 +1,7 @@ +2008-06-16 Ralf Wildenhues + + * Makefile.in (datarootdir): New variable. + 2008-06-10 Joseph Myers * dconfig.h: New. diff --git a/libdecnumber/Makefile.in b/libdecnumber/Makefile.in index b17505902af..bdfbe435ed9 100644 --- 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@ -- cgit v1.2.1