Fix the build.

Author: alexrp

Makefile

@@ -43,22 +43,19 @@ export MONO_PREFIX ?= /usr
 MODE ?= Debug
 
 ifeq ($(MODE), Debug)
-	override xb_mode = net_4_0_Debug
 	override mono_opt = --debug
 
 	FSHARPC_FLAGS += --debug+
 	MCS_FLAGS += -debug
 else
-	override xb_mode = net_4_0_Release
-
 	FSHARPC_FLAGS += --optimize
 	MCS_FLAGS += -optimize
 endif
 
 FSHARPC_FLAGS += --nologo --warnaserror
 GENDARME_FLAGS += --severity all --confidence all
 MCS_FLAGS += -langversion:experimental -unsafe -warnaserror
-XBUILD_FLAGS += /nologo /property:Configuration=$(xb_mode) /verbosity:quiet
+XBUILD_FLAGS += /nologo /property:Configuration=$(MODE) /verbosity:quiet
 
 FSHARPC_TEST_FLAGS += --debug+ --nologo --warnaserror
 MCS_TEST_FLAGS += -debug -langversion:experimental -unsafe -warnaserror
@@ -117,7 +114,7 @@ clean-check:
 	$(RM) $(tests)
 
 clean-deps:
-	$(CD) dep/debugger-libs && $(XBUILD) $(XBUILD_FLAGS) /target:Clean
+	$(CD) dep/debugger-libs && $(XBUILD) $(XBUILD_FLAGS) /target:Clean debugger-libs.sln
 
 clean-release:
 	$(RM) -r rel
@@ -163,15 +160,15 @@ override refs = \
 	Mono.Debugging.Soft.dll
 
 $(addprefix bin/, $(refs)):
-	$(CD) dep/debugger-libs && $(NUGET) restore && $(XBUILD) $(XBUILD_FLAGS) debugger-libs.sln
+	$(CD) dep/debugger-libs && $(NUGET) restore debugger-libs.sln && $(XBUILD) $(XBUILD_FLAGS) debugger-libs.sln
 	$(MKDIR) -p bin
 	$(CP) dep/nrefactory/bin/Debug/ICSharpCode.NRefactory.dll \
 		bin/ICSharpCode.NRefactory.dll
 	$(CP) dep/nrefactory/bin/Debug/ICSharpCode.NRefactory.CSharp.dll \
 		bin/ICSharpCode.NRefactory.CSharp.dll
-	$(CP) dep/cecil/bin/$(xb_mode)/Mono.Cecil.dll \
+	$(CP) dep/debugger-libs/packages/Mono.Cecil.0.10.0-beta6/lib/net40/Mono.Cecil.dll \
 		bin/Mono.Cecil.dll
-	$(CP) dep/cecil/bin/$(xb_mode)/Mono.Cecil.Mdb.dll \
+	$(CP) dep/debugger-libs/packages/Mono.Cecil.0.10.0-beta6/lib/net40/Mono.Cecil.Mdb.dll \
 		bin/Mono.Cecil.Mdb.dll
 	$(CP) dep/debugger-libs/Mono.Debugger.Soft/bin/Debug/Mono.Debugger.Soft.dll \
 		bin/Mono.Debugger.Soft.dll