From b48ed5683a719c42d69bed15028ff177d12ede62 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@cygnus.com>
Date: Mon, 21 Jun 1999 13:03:47 +0000
Subject: Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (toolexeclibdir): Define as libdir when
	appropriate.
	* configure: Rebuilt.
	* configure.in (USE_LIBDIR): New conditional.

From-SVN: r27667
---
 boehm-gc/ChangeLog    |  6 ++++++
 boehm-gc/Makefile.am  |  6 ++++++
 boehm-gc/Makefile.in  |  9 ++++++---
 boehm-gc/configure    | 12 ++++++++++++
 boehm-gc/configure.in |  2 ++
 5 files changed, 32 insertions(+), 3 deletions(-)

(limited to 'boehm-gc')

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index ec184cd..ec0bc57 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,5 +1,11 @@
 1999-06-21  Tom Tromey  <tromey@cygnus.com>
 
+	* Makefile.in: Rebuilt.
+	* Makefile.am (toolexeclibdir): Define as libdir when
+	appropriate.
+	* configure: Rebuilt.
+	* configure.in (USE_LIBDIR): New conditional.
+
 	* configure: Rebuilt.
 	* configure.in: Recognize all forms of alpha.
 
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index cd18abb..48d5211 100644
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -14,8 +14,14 @@ MULTISUBDIR =
 MULTIDO = true
 MULTICLEAN = true
 
+## Install a library built with a cross compiler in tooldir, not
+## libdir.
+if USE_LIBDIR
+toolexeclibdir = $(libdir)
+else
 toolexecdir = $(exec_prefix)/$(target_alias)
 toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
+endif
 
 toolexeclib_LTLIBRARIES = $(target_all)
 EXTRA_LTLIBRARIES = libgcjgc.la
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index 0e9525f..1980313 100644
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -98,9 +98,12 @@ MULTIDIRS =
 MULTISUBDIR = 
 MULTIDO = true
 MULTICLEAN = true
-
-toolexecdir = $(exec_prefix)/$(target_alias)
-toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
+@USE_LIBDIR_TRUE@toolexeclibdir = \
+@USE_LIBDIR_TRUE@$(libdir)
+@USE_LIBDIR_FALSE@toolexeclibdir = \
+@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
+@USE_LIBDIR_FALSE@toolexecdir = \
+@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
 
 toolexeclib_LTLIBRARIES = $(target_all)
 EXTRA_LTLIBRARIES = libgcjgc.la
diff --git a/boehm-gc/configure b/boehm-gc/configure
index 9fb2597..e75e17b 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -2827,6 +2827,16 @@ EOF
 
 fi
 
+
+
+if test -z "$with_cross_host"; then
+  USE_LIBDIR_TRUE=
+  USE_LIBDIR_FALSE='#'
+else
+  USE_LIBDIR_TRUE='#'
+  USE_LIBDIR_FALSE=
+fi
+
 if test "${multilib}" = "yes"; then
   multilib_arg="--enable-multilib"
 else
@@ -3026,6 +3036,8 @@ s%@INCLUDES@%$INCLUDES%g
 s%@CXXINCLUDES@%$CXXINCLUDES%g
 s%@addobjs@%$addobjs%g
 s%@MY_CFLAGS@%$MY_CFLAGS%g
+s%@USE_LIBDIR_TRUE@%$USE_LIBDIR_TRUE%g
+s%@USE_LIBDIR_FALSE@%$USE_LIBDIR_FALSE%g
 
 CEOF
 EOF
diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in
index f94c437..f14a677 100644
--- a/boehm-gc/configure.in
+++ b/boehm-gc/configure.in
@@ -202,6 +202,8 @@ if test -n "${with_cross_host}"; then
    AC_DEFINE(SMALL_CONFIG)
 fi
 
+AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
+
 if test "${multilib}" = "yes"; then
   multilib_arg="--enable-multilib"
 else
-- 
cgit v1.1