* java/io/Writer.java (Writer(Object)): Check for null lock object.

[pf3gnuchains/gcc-fork.git] / zlib / Makefile.am

diff --git a/zlib/Makefile.am b/zlib/Makefile.am
index 46ac3de..48e5385 100644 (file)
--- a/zlib/Makefile.am
+++ b/zlib/Makefile.am
@@ -10,15 +10,6 @@ MULTISUBDIR =
 MULTIDO = true
 MULTICLEAN = true
 
-## Install a library built with a cross compiler in tooldir, not
-## libdir.
-if USE_LIBDIR
-toolexeclibdir = $(libdir)$(MULTISUBDIR)
-else
-toolexecdir = $(exec_prefix)/$(target_alias)
-toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
-endif
-
 ZLIB_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \
 gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h \
 inffixed.h inflate.c inftrees.c inftrees.h infutil.c infutil.h trees.c \
@@ -30,6 +21,7 @@ libzgcj_convenience_la_SOURCES = $(ZLIB_SOURCES)
 else
 toolexeclib_LIBRARIES = libz.a
 libz_a_SOURCES = $(ZLIB_SOURCES)
+libz_a_CFLAGS = $(AM_CFLAGS)
 endif
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS