diff options
| author | Tom Tromey <tromey@cygnus.com> | 1999-06-21 13:03:47 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@cygnus.com> | 1999-06-21 13:03:47 +0000 |
| commit | dfec5350281b9d43e54b4ea5ecf66b3b834d442f (patch) | |
| tree | 3eb065174a652092763e1549b98f6df22f1939c4 /zlib | |
| parent | 63b9d08ef623390a7afc22b081fb319ec335f6b9 (diff) | |
* Makefile.in: Rebuilt.
* Makefile.am (toolexeclibdir): Define as libdir when
appropriate.
* configure: Rebuilt.
* configure.in (USE_LIBDIR): New conditional.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@27667 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/ChangeLog.gcj | 8 | ||||
| -rw-r--r-- | zlib/Makefile.am | 6 | ||||
| -rw-r--r-- | zlib/Makefile.in | 9 | ||||
| -rwxr-xr-x | zlib/configure | 12 | ||||
| -rw-r--r-- | zlib/configure.in | 2 |
5 files changed, 34 insertions, 3 deletions
diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 931a80e4dc6..a6b1c9d1f25 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 cf27582dbec..f00bc78a354 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 ac34d65240c..d10b4df0211 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 9289120d18e..6c2ade1cd82 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 4b63cb2ea72..dc4d5c8a2ad 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 |