From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 21 Jun 1999 13:03:47 +0000 (+0000)
Subject: 	* Makefile.in: Rebuilt.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7960a94d32415345f09d75d7ff7c760bd8914ed3;p=gc

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27667 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/ChangeLog b/ChangeLog
index ec184cd4..ec0bc571 100644
--- a/ChangeLog
+++ b/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/Makefile.am b/Makefile.am
index cd18abbe..48d5211e 100644
--- a/Makefile.am
+++ b/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/Makefile.in b/Makefile.in
index 0e9525f3..19803135 100644
--- a/Makefile.in
+++ b/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/configure b/configure
index 9fb2597a..e75e17b3 100755
--- a/configure
+++ b/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/configure.in b/configure.in
index f94c4374..f14a677d 100644
--- a/configure.in
+++ b/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