Merge autoconf / automake update changes from GCC.

[external/binutils.git] / zlib / Makefile.am

diff --git a/zlib/Makefile.am b/zlib/Makefile.am
index 82f709d..520f065 100644 (file)
--- a/zlib/Makefile.am
+++ b/zlib/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.8 cygnus
+AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL_AMFLAGS = -I .. -I ../config
 
@@ -59,3 +59,5 @@ AM_MAKEFLAGS = \
        "PICFLAG=$(PICFLAG)" \
        "RANLIB=$(RANLIB)" \
        "DESTDIR=$(DESTDIR)"
+
+include $(top_srcdir)/../multilib.am