Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
	builds.

	* configure: Rebuilt.
	* configure.in: Properly align --help output, fix capitalization.

From-SVN: r28640

zlib/ChangeLog.gcj

+Mon Aug  9 18:33:38 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* Makefile.in: Rebuilt.
+	* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
+	builds.
+
+	* configure: Rebuilt.
+	* configure.in: Properly align --help output, fix capitalization.
+
 1999-08-02  Tom Tromey  <tromey@cygnus.com>
 
 	* aclocal.m4, configure: Rebuilt for new libtool.

zlib/Makefile.am

@@ -13,7 +13,7 @@ MULTICLEAN = true
 ## Install a library built with a cross compiler in tooldir, not
 ## libdir.
 if USE_LIBDIR
-toolexeclibdir = $(libdir)
+toolexeclibdir = $(libdir)$(MULTISUBDIR)
 else
 toolexecdir = $(exec_prefix)/$(target_alias)
 toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)

zlib/Makefile.in

@@ -92,7 +92,7 @@ MULTISUBDIR =
 MULTIDO = true
 MULTICLEAN = true
 @USE_LIBDIR_TRUE@toolexeclibdir = \
-@USE_LIBDIR_TRUE@$(libdir)
+@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
 @USE_LIBDIR_FALSE@toolexeclibdir = \
 @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
 @USE_LIBDIR_FALSE@toolexecdir = \

zlib/configure.in

@@ -11,13 +11,14 @@ AC_CONFIG_AUX_DIR(..)
 
 dnl We use these options to decide which functions to include.
 AC_ARG_WITH(target-subdir,
-[  --with-target-subdir=SUBDIR      Configuring in a subdirectory])
+[  --with-target-subdir=SUBDIR
+                          configuring in a subdirectory])
 AC_ARG_WITH(cross-host,
-[  --with-cross-host=HOST           Configuring with a cross compiler])
+[  --with-cross-host=HOST  configuring with a cross compiler])
 
 dnl Default to --enable-multilib
 AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
+[  --enable-multilib       build many library versions (default)],
 [case "${enableval}" in
   yes) multilib=yes ;;
   no)  multilib=no ;;
@@ -39,7 +40,7 @@ fi
 AC_SUBST(zlib_basedir)
 
 AC_ARG_WITH(system-zlib,
-[  --with-system-zlib               Use installed libz])
+[  --with-system-zlib      use installed libz])
 
 LIB_AC_PROG_CC
 AM_PROG_LIBTOOL