aboutsummaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorTom Tromey <tromey@cygnus.com>1999-06-21 13:03:47 +0000
committerTom Tromey <tromey@gcc.gnu.org>1999-06-21 13:03:47 +0000
commitb48ed5683a719c42d69bed15028ff177d12ede62 (patch)
tree3eb065174a652092763e1549b98f6df22f1939c4 /zlib
parentb1b9b120a47d828987d11fe921fd872bf67c496e (diff)
downloadgcc-b48ed5683a719c42d69bed15028ff177d12ede62.zip
gcc-b48ed5683a719c42d69bed15028ff177d12ede62.tar.gz
gcc-b48ed5683a719c42d69bed15028ff177d12ede62.tar.bz2
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
Diffstat (limited to 'zlib')
-rw-r--r--zlib/ChangeLog.gcj8
-rw-r--r--zlib/Makefile.am6
-rw-r--r--zlib/Makefile.in9
-rwxr-xr-xzlib/configure12
-rw-r--r--zlib/configure.in2
5 files changed, 34 insertions, 3 deletions
diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 931a80e..a6b1c9d 100644
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +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.
+
1999-05-10 Tom Tromey <tromey@cygnus.com>
* configure, Makefile.in: Rebuilt.
diff --git a/zlib/Makefile.am b/zlib/Makefile.am
index cf27582..f00bc78 100644
--- a/zlib/Makefile.am
+++ b/zlib/Makefile.am
@@ -10,8 +10,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
## We don't use `libz.la' because we don't want to conflict with a
## system library of that name.
diff --git a/zlib/Makefile.in b/zlib/Makefile.in
index ac34d65..d10b4df 100644
--- a/zlib/Makefile.in
+++ b/zlib/Makefile.in
@@ -91,9 +91,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 = libzgcj.la
diff --git a/zlib/configure b/zlib/configure
index 9289120..6c2ade1 100755
--- a/zlib/configure
+++ b/zlib/configure
@@ -2701,6 +2701,16 @@ fi
done
+
+
+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
@@ -2895,6 +2905,8 @@ s%@LIBTOOL@%$LIBTOOL%g
s%@COMPPATH@%$COMPPATH%g
s%@CPP@%$CPP%g
s%@target_all@%$target_all%g
+s%@USE_LIBDIR_TRUE@%$USE_LIBDIR_TRUE%g
+s%@USE_LIBDIR_FALSE@%$USE_LIBDIR_FALSE%g
CEOF
EOF
diff --git a/zlib/configure.in b/zlib/configure.in
index 4b63cb2..dc4d5c8 100644
--- a/zlib/configure.in
+++ b/zlib/configure.in
@@ -79,6 +79,8 @@ AC_SUBST(target_all)
AC_CHECK_HEADERS(unistd.h)
+AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
+
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"
else