Makefile.in (top_builddir): Define to .

gcc/ChangeLog:

2004-04-25  Paolo Bonzini  <bonzini@gnu.org>

        * Makefile.in (top_builddir): Define to .

intl/ChangeLog:

2004-04-25  Paolo Bonzini  <bonzini@gnu.org>

        * configure.ac: Point config.intl to the parent directory of
        ${top_builddir}.
	* configure: Regenerate.

From-SVN: r82259

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 19c5a6610daec61025555d53b1cea8d6310b885a..e9ae056e6448c9cc18fe92d4a1b977c1fd244002 100644 (file)
--- 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 bd6afbe1654146675b79331815ae80aec018b37d..ad4a7cd57d6c4f0f22c16f934deb2209107b832e 100644 (file)
--- 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 e3df6a88bed122c7b8ad8f2570b4b8f6219e9267..9f4e7f51f533f100c644604f726c8a9cd962e750 100644 (file)
--- 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 32d77536b182e8131f9f44e6289a8f2535315174..f212db5371e32865b42226e9514245baa10a98d9 100755 (executable)
--- 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 516057b3af27be1605c89894c0241302bc839119..0d9efc98182ac5f571a2a76d61a647ee7b355215 100644 (file)
--- 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