* 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 ec184cd46facbc7671334309084e7b055d92a60a..ec0bc5713cda1adb9158175f6897d1177441fd4a 100644 (file)
--- 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 cd18abbeed209a0a6d127449003b73e708ed7681..48d5211eec6b11e6858eacb56b5a1ea35bf8a6c2 100644 (file)
--- 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 0e9525f37d0b969a6f8696ce5ca2069266d56422..19803135e53a9084530c485d289e1f1d95cee4f7 100644 (file)
--- 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 9fb2597acc4ee70d83c00b7b700ab55ee98c7c4e..e75e17b346294976d0d1bb712699bdfea1219d7a 100755 (executable)
--- 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 f94c4374df1fc563f0ee9ce6fbf6511a4c4dcf70..f14a677d9fed115a428eb903c8c8b9fcca60e7e6 100644 (file)
--- 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