[Mono-list] CVS compile errors :(

[Paolo Molaro]

On 05/04/04 Pablo Baena wrote:
> > We changes the makefiles back to be compatible with automake 1.4, too.
> >
> 
> 
> The back compatibility doesn't seem to work with automake1.4 still:

It did, since I run automake 1.4 myself.

> runtime/net_2_0/Makefile.am:74: warning: automake does not support conditional 
> definition of gac_assemblies in EXTRA_DIST
> **Error**: automake failed.

This is a different issue introduced late last night.
The included patch to apply in mono/runtime should fix it for you.

lupus

-- 
-----------------------------------------------------------------
lupus@debian.org                                     debian/rules
lupus@ximian.com                             Monkeys do it better

Index: Makefile.am
===================================================================
RCS file: /cvs/public/mono/runtime/Makefile.am,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile.am
--- Makefile.am	3 May 2004 21:41:08 -0000	1.72
+++ Makefile.am	4 May 2004 15:09:59 -0000
@@ -2,7 +2,11 @@
 # being compiled on windows.
 #
 
+if INSTALL_2_0
 SUBDIRS = . net_1_1 net_2_0
+else
+SUBDIRS = . net_1_1
+endif
 
 mcs_topdir=$(top_srcdir)/../mcs
 
Index: net_2_0/Makefile.am
===================================================================
RCS file: /cvs/public/mono/runtime/net_2_0/Makefile.am,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile.am
--- net_2_0/Makefile.am	4 May 2004 07:38:05 -0000	1.23
+++ net_2_0/Makefile.am	4 May 2004 15:09:59 -0000
@@ -62,11 +62,7 @@ gac_assemblies_list = \
 	System.Windows.Forms				\
 	System.Xml
 
-if INSTALL_2_0
 gac_assemblies = $(gac_assemblies_list:=.dll)
-else
-gac_assemblies = 
-endif
 
 corlibdir = $(libdir)/mono/2.0
 corlib_DATA = mscorlib.dll