diff options
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/Makefile.in | 4 | ||||
| -rw-r--r-- | intl/ChangeLog | 6 | ||||
| -rwxr-xr-x | intl/configure | 6 | ||||
| -rw-r--r-- | intl/configure.ac | 6 |
5 files changed, 20 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 19c5a66..e9ae056 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2004-04-25 Paolo Bonzini <bonzini@gnu.org> + + * Makefile.in (top_builddir): Define to . + 2004-05-25 Alexandre Oliva <aoliva@redhat.com> * configure.ac (gcc_cv_ld): Prefer in-tree ld over whatever the diff --git a/gcc/Makefile.in b/gcc/Makefile.in index bd6afbe..ad4a7cd 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 e3df6a8..9f4e7f5 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,9 @@ +2004-04-25 Paolo Bonzini <bonzini@gnu.org> + + * configure.ac: Point config.intl to the parent directory of + ${top_builddir}. + * configure: Regenerate. + 2004-03-10 Kelley Cook <kcook@gcc.gnu.org> * configure.ac: Bump AC_PREREQ to 2.59. diff --git a/intl/configure b/intl/configure index 32d7753..f212db5 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 516057b..0d9efc9 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 |