summaryrefslogtreecommitdiff
path: root/intl
diff options
context:
space:
mode:
authorbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2004-05-25 20:16:56 +0000
committerbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2004-05-25 20:16:56 +0000
commit741b772680cbaa17353fff6ab1f693811fa1d192 (patch)
tree65c3f49767a6096977672d4a84ce3b6e4751d42c /intl
parent5822029019a1746f9e29fc0dea32f9347d5913ad (diff)
downloadgcc-741b772680cbaa17353fff6ab1f693811fa1d192.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82259 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'intl')
-rw-r--r--intl/ChangeLog6
-rwxr-xr-xintl/configure6
-rw-r--r--intl/configure.ac6
3 files changed, 14 insertions, 4 deletions
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 <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 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