* runtime/Makefile.am ($(monoone_DATA),$(monotwo_DATA),$(monobins_DATA)):

Don't copy from prefix.  Use $(LN_S) to point to the mcs/ tree.
* runtime/net_1_1/Makefile.am (mscorlib.dll,$(gac_assemblies)):
Use $(LN_S) to point to the mcs/ tree, rather than copying.
* runtime/net_2_0/Makefile.am (mscorlib.dll,$(gac_assemblies)): Likewise.

svn path=/trunk/mono/; revision=29171

3 files changed, 8 insertions, 35 deletions

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 88be6ea53c8..234b5a37210 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -54,21 +54,10 @@ monoonedir = $(libdir)/mono/1.0/
 monotwodir = $(libdir)/mono/2.0/
 endif
 
-$(monoone_DATA):
-	if test -f $(mcs_topdir)/mcs/mcs.exe; then f=$(mcs_topdir)/mcs/mcs.exe; else f=$(fx11dir)/mcs.exe; fi; \
-	echo "cp -f $$f $(srcdir)"; \
-	cp -f $$f $(srcdir)
-	if test -f $(mcs_topdir)/mbas/mbas.exe; then f=$(mcs_topdir)/mbas/mbas.exe; else f=$(fx11dir)/mbas.exe; fi; \
-	echo "cp -f $$f $(srcdir)"; \
-	cp -f $$f $(srcdir)
-
-$(monotwo_DATA):
-	if test -f $(mcs_topdir)/gmcs/gmcs.exe; then f=$(mcs_topdir)/gmcs/gmcs.exe; else f=$(fx20dir)/gmcs.exe; fi; \
-	echo "cp -f $$f $(srcdir)"; \
-	cp -f $$f $(srcdir)
-
-$(monobins_DATA):
+$(monoone_DATA) $(monotwo_DATA) $(monobins_DATA):
 	@case "$@" in \
+	mcs.exe)		 d=mcs				;; \
+	mbas.exe)		 d=mbas				;; \
 	monoresgen.exe)          d=monoresgen                   ;; \
 	ilasm.exe)               d=ilasm                        ;; \
 	cilc.exe)                d=tools/cilc                   ;; \
@@ -94,10 +83,8 @@ $(monobins_DATA):
 	gacutil.exe)		 d=tools/gacutil		;; \
 	gmcs.exe)                d=gmcs				;; \
 	esac; \
-	f=$(mcs_topdir)/$$d/$@; \
-	if test -f $$f; then :; else f=$(monobinsdir)/$@; fi ; \
-	echo "cp -f $$f $(srcdir)"; \
-	cp -f $$f $(srcdir)
+	echo "  cd $(srcdir) && $(LN_S) ../../mcs/$$d/$@ $@" ; \
+	cd $(srcdir) && $(LN_S) ../../mcs/$$d/$@ $@
 
 copy_dlls:
 	cp /nt/mono/mcs/class/*/*.dll .
diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am
index 448ee0ccaad..04427b0495f 100644
--- a/runtime/net_1_1/Makefile.am
+++ b/runtime/net_1_1/Makefile.am
@@ -2,7 +2,6 @@
 # being compiled on windows.
 #
 
-mcs_topdir=$(top_srcdir)/../mcs
 gacutil=$(srcdir)/../gacutil.exe
 
 if USE_JIT
@@ -71,13 +70,8 @@ corlib_DATA = mscorlib.dll
 EXTRA_DIST = $(gac_assemblies) $(corlib_DATA)
 MAINTAINERCLEANFILES = $(EXTRA_DIST)
 
-#
-# Keep in sync with mono/mono/metadata/Makefile.am
-#
-assembliesdir = $(libdir)
-
 mscorlib.dll $(gac_assemblies):
-	cp -f $(mcs_topdir)/class/lib/default/$@ $(srcdir)
+	cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/default/$@ $@
 
 all-local: $(gac_assemblies)
 
diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am
index e0cf6fc4bcf..98be13adff4 100644
--- a/runtime/net_2_0/Makefile.am
+++ b/runtime/net_2_0/Makefile.am
@@ -2,7 +2,6 @@
 # being compiled on windows.
 #
 
-mcs_topdir=$(top_srcdir)/../mcs
 gacutil=$(srcdir)/../gacutil.exe
 
 if USE_JIT
@@ -77,15 +76,8 @@ corlib_DATA = $(local_mscorlib)
 EXTRA_DIST = $(gac_assemblies) $(corlib_DATA)
 MAINTAINERCLEANFILES = $(EXTRA_DIST)
 
-#
-# Keep in sync with mono/mono/metadata/Makefile.am
-#
-assembliesdir = $(libdir)
-
-dummy $(local_mscorlib) $(gac_assemblies):
-	cp -f $(mcs_topdir)/class/lib/net_2_0/$@ $(srcdir)
-
-dummy:
+mscorlib.dll $(gac_assemblies):
+	cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/net_2_0/$@ $@
 
 all-local: $(gac_assemblies)