From 5da9128adac1e5d2ae93d1c20b8c202225ae6355 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 25 May 2004 20:16:56 +0000 Subject: [PATCH] Makefile.in (top_builddir): Define to . gcc/ChangeLog: 2004-04-25 Paolo Bonzini * Makefile.in (top_builddir): Define to . intl/ChangeLog: 2004-04-25 Paolo Bonzini * configure.ac: Point config.intl to the parent directory of ${top_builddir}. * configure: Regenerate. From-SVN: r82259 --- gcc/ChangeLog | 4 ++++ gcc/Makefile.in | 4 ++-- intl/ChangeLog | 6 ++++++ intl/configure | 6 ++++-- intl/configure.ac | 6 ++++-- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 19c5a6610da..e9ae056e644 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2004-04-25 Paolo Bonzini + + * Makefile.in (top_builddir): Define to . + 2004-05-25 Alexandre Oliva * configure.ac (gcc_cv_ld): Prefer in-tree ld over whatever the diff --git a/gcc/Makefile.in b/gcc/Makefile.in index bd6afbe1654..ad4a7cd57d6 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -77,8 +77,8 @@ docdir = @srcdir@/doc abs_srcdir = @abs_srcdir@ abs_docdir = @abs_srcdir@/doc -# Top build directory, relative to here. -top_builddir = .. +# Top build directory for this package, relative to here. +top_builddir = . # objdir is set by configure. # It's normally the absolute path to the current directory. objdir = @objdir@ diff --git a/intl/ChangeLog b/intl/ChangeLog index e3df6a88bed..9f4e7f51f53 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,9 @@ +2004-04-25 Paolo Bonzini + + * configure.ac: Point config.intl to the parent directory of + ${top_builddir}. + * configure: Regenerate. + 2004-03-10 Kelley Cook * configure.ac: Bump AC_PREREQ to 2.59. diff --git a/intl/configure b/intl/configure index 32d77536b18..f212db5371e 100755 --- a/intl/configure +++ b/intl/configure @@ -7037,8 +7037,10 @@ LIBINTL_DEP= INCINTL= case $USE_INCLUDED_LIBINTL in yes) - LIBINTL_DEP='${top_builddir}/intl/libintl.a' - INCINTL='-I${top_builddir}/intl' + LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},&/..,' ` + LTLIBINTL=`echo $LTLIBINTL | sed 's,${top_builddir},&/..,' ` + LIBINTL_DEP='${top_builddir}/../intl/libintl.a' + INCINTL='-I${top_builddir}/../intl' ;; esac diff --git a/intl/configure.ac b/intl/configure.ac index 516057b3af2..0d9efc98182 100644 --- a/intl/configure.ac +++ b/intl/configure.ac @@ -24,8 +24,10 @@ LIBINTL_DEP= INCINTL= case $USE_INCLUDED_LIBINTL in yes) - LIBINTL_DEP='${top_builddir}/intl/libintl.a' - INCINTL='-I${top_builddir}/intl' + LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},&/..,' ` + LTLIBINTL=`echo $LTLIBINTL | sed 's,${top_builddir},&/..,' ` + LIBINTL_DEP='${top_builddir}/../intl/libintl.a' + INCINTL='-I${top_builddir}/../intl' ;; esac -- 2.30.2