From: Marek Safar <marek.safar@gmail.com>
Date: Tue, 10 Feb 2015 09:21:29 +0000 (+0100)
Subject: Rename binary reference assemblies location
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=158487fe943a4cccb14337087db225a5571928d3;p=mono.git

Rename binary reference assemblies location
---

diff --git a/.gitmodules b/.gitmodules
index 7cf5b99cbe8..1ed0f9a9dcd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,5 +31,5 @@
 	url = git://github.com/mono/referencesource
 	branch = mono
 [submodule "external/reference-assemblies"]
-	path = external/reference-assemblies
+	path = external/binary-reference-assemblies
 	url = git://github.com/mono/reference-assemblies.git
diff --git a/Makefile.am b/Makefile.am
index eb4d0443e03..cddaff16211 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,7 @@ dist-hook:
 	d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
 	rm -rf `find $(top_distdir)/external -path '*\.git'`
 	rm -f `find $(top_distdir)/external -path '*\.exe'`
-	rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/reference-assemblies/v4\.0*'`
+	rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/v4\.0*'`
 	cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
 	cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
 # Disable this for now because it is very slow and causes wrench to timeout:
diff --git a/external/binary-reference-assemblies b/external/binary-reference-assemblies
new file mode 160000
index 00000000000..4abf9a74bd9
--- /dev/null
+++ b/external/binary-reference-assemblies
@@ -0,0 +1 @@
+Subproject commit 4abf9a74bd9a807380ba8f55a73b322625e15565
diff --git a/external/reference-assemblies b/external/reference-assemblies
deleted file mode 160000
index 4abf9a74bd9..00000000000
--- a/external/reference-assemblies
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4abf9a74bd9a807380ba8f55a73b322625e15565
diff --git a/mcs/class/reference-assemblies/Makefile b/mcs/class/reference-assemblies/Makefile
index c3f5248d126..a14f96f208a 100644
--- a/mcs/class/reference-assemblies/Makefile
+++ b/mcs/class/reference-assemblies/Makefile
@@ -6,8 +6,8 @@ all-local:
 
 install-local:
 	$(MKINSTALLDIRS) $(DESTDIR)$(LIBRARY_INSTALL_DIR)
-	$(INSTALL_LIB) ../../../external/reference-assemblies/v4.0/* $(DESTDIR)$(LIBRARY_INSTALL_DIR)
+	$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.0/* $(DESTDIR)$(LIBRARY_INSTALL_DIR)
 
-DISTFILES = $(wildcard ../../../external/reference-assemblies/v4.0/*) Makefile
+DISTFILES = $(wildcard ../../../external/binary-reference-assemblies/v4.0/*) Makefile
 
 dist-local: dist-default