In build:

	* library.make (lib_dir): Define to 'compat' if LIBRARY_COMPAT is
	defined, 'lib' otherwise.
	(the_lib): Use it to decide where to place the output library.

In class:
	* Makefile (default_SUBDIRS): Add Compat.ICSharpCode.SharpZipLib.
	* compat/default, compat/net_2_0: New directories for holding
	backwards-compatibility libraries.  These will not be used inside
	the tree, but will be installed into the GAC.

In class/Compat.ICSharpCode.SharpZipLib:
	Mark this as a backwards-compatibility library.
	* Makefile (thisdir): Update to new location.
	(LIBRARY): Rename to be unique.
	(LIBRARY_NAME, LIBRARY_COMPAT): Define.
	* Compat.ICSharpCode.SharpZipLib.dll.sources: Rename from
	ICSharpCode.SharpZipLib.dll.sources to reflect changes.

svn path=/trunk/mcs/; revision=54724

7 files changed, 35 insertions, 4 deletions

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 81a723e99fd..bb8d127de8d 100644
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-22  Raja R Harinath  <rharinath@novell.com>
+
+	* library.make (lib_dir): Define to 'compat' if LIBRARY_COMPAT is
+	defined, 'lib' otherwise.
+	(the_lib): Use it to decide where to place the output library.
+
 2005-12-03  Kornél Pál  <kornelpal@hotmail.com>
 
 	* config-default.make: Corrected default CODEPAGE comment to ISO-8859-1
diff --git a/mcs/build/library.make b/mcs/build/library.make
index 3d94ab9709b..a24300c6fcb 100644
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -38,8 +38,14 @@ ifndef LIBRARY_NAME
 LIBRARY_NAME = $(LIBRARY)
 endif
 
+ifdef LIBRARY_COMPAT
+lib_dir = compat
+else
+lib_dir = lib
+endif
+
 makefrag = $(depsdir)/$(PROFILE)_$(LIBRARY).makefrag
-the_lib = $(topdir)/class/lib/$(PROFILE)/$(LIBRARY_NAME)
+the_lib = $(topdir)/class/$(lib_dir)/$(PROFILE)/$(LIBRARY_NAME)
 the_pdb = $(the_lib:.dll=.pdb)
 the_mdb = $(the_lib).mdb
 library_CLEAN_FILES += $(makefrag) $(the_lib) $(the_pdb) $(the_mdb)
diff --git a/mcs/class/ChangeLog b/mcs/class/ChangeLog
index ea81afa7487..3ee3e21c45f 100644
--- a/mcs/class/ChangeLog
+++ b/mcs/class/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-22  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (default_SUBDIRS): Add Compat.ICSharpCode.SharpZipLib.
+	* compat/default, compat/net_2_0: New directories for holding
+	backwards-compatibility libraries.  These will not be used inside
+	the tree, but will be installed into the GAC.
+
 2005-12-12  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* Makefile : seems like net_2_0_ONLY_SUBDIRS must precede.
diff --git a/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog b/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog
index 8e91e21a4c4..693d2174efe 100644
--- a/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog
+++ b/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-22  Raja R Harinath  <rharinath@novell.com>
+
+	Mark this as a backwards-compatibility library.
+	* Makefile (thisdir): Update to new location.
+	(LIBRARY): Rename to be unique.
+	(LIBRARY_NAME, LIBRARY_COMPAT): Define.
+	* Compat.ICSharpCode.SharpZipLib.dll.sources: Rename from
+	ICSharpCode.SharpZipLib.dll.sources to reflect changes.
+
 2004-11-25  Raja R Harinath  <rharinath@novell.com>
 
 	* Makefile (EXTRA_DISTFILES): Add SharpZipLib.pub.
diff --git a/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.dll.sources b/mcs/class/Compat.ICSharpCode.SharpZipLib/Compat.ICSharpCode.SharpZipLib.dll.sources
index 98de302206b..98de302206b 100644
--- a/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.dll.sources
+++ b/mcs/class/Compat.ICSharpCode.SharpZipLib/Compat.ICSharpCode.SharpZipLib.dll.sources
diff --git a/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile b/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile
index fe5ae55972c..fc5c44de7f1 100644
--- a/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile
+++ b/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile
@@ -1,11 +1,13 @@
-thisdir = class/ICSharpCode.SharpZipLib
+thisdir = class/Compat.ICSharpCode.SharpZipLib
 SUBDIRS = 
 include ../../build/rules.make
 
-LIBRARY = ICSharpCode.SharpZipLib.dll
+LIBRARY = Compat.ICSharpCode.SharpZipLib.dll
+LIBRARY_NAME = ICSharpCode.SharpZipLib.dll
+LIBRARY_COMPAT = yes
 LIBRARY_SNK = SharpZipLib.key
 
-LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll
+LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll
 NO_TEST = yes
 EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
 
diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index b880b3359fa..f4a21f3605c 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -66,6 +66,7 @@ default_SUBDIRS := \
 	PEAPI				\
 	Npgsql				\
 	ICSharpCode.SharpZipLib		\
+	Compat.ICSharpCode.SharpZipLib	\
 	ByteFX.Data			\
 	Commons.Xml.Relaxng		\
 	Novell.Directory.Ldap		\