Rename binary reference assemblies location

mikkeljohnsen · Feb 10, 2015 · 158487f · 158487f
1 parent 85ee558
commit 158487f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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/reference-assemblies → external/binary-reference-assemblies b/external/reference-assemblies → external/binary-reference-assemblies
diff --git 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