Rename binary reference assemblies location

diff --git a/.gitmodules b/.gitmodules
index 7cf5b99cbe81794f8328f6098bc91fa64624282e..1ed0f9a9dcd9516e5f094512180b4f33bab42924 100644 (file)
--- 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 eb4d0443e039bdeeafb9dd7e475c34512a4f35c0..cddaff1621145dac0cf0f23f4d6b58b19c002ad9 100644 (file)
--- 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 (submodule)
index 0000000..4abf9a7
--- /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 (submodule)
index 4abf9a7..0000000
--- 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 c3f5248d12654090059074825b545468231e83d9..a14f96f208a34c766d684648faa0b742fe5caa9b 100644 (file)
--- 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