Use correct version of xbuild 4.0 targets

diff --git a/mcs/class/Microsoft.Build.Utilities/Makefile b/mcs/class/Microsoft.Build.Utilities/Makefile
index 1a3ab984a5b12a7cb57addc07ceb7887b89ab2c5..a357955858f09dff14923b1ff257e112047cdf18 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Makefile
+++ b/mcs/class/Microsoft.Build.Utilities/Makefile
@@ -9,7 +9,7 @@ ifeq (3.5, $(FRAMEWORK_VERSION))
 LIBRARY_NAME = Microsoft.Build.Utilities.v3.5.dll
 BUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/$(BUILD_FRAMEWORK)
 else
-ifeq (4.0, $(FRAMEWORK_VERSION))
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 LIBRARY_NAME = Microsoft.Build.Utilities.v4.0.dll
 endif
 endif

diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile
index 08a9123cb22425254dffe997807cb311bbceb9e9..1daf53ab333f51d691cc1a80de20d2b40c131026 100644 (file)
--- a/mcs/tools/xbuild/Makefile
+++ b/mcs/tools/xbuild/Makefile
@@ -5,6 +5,7 @@ HAS_NUNIT_TEST = yes
 
 BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
 BUILD_ENGINE = Microsoft.Build.Engine.dll
+INSTALL_FRAMEWORK_VERSION = $(FRAMEWORK_VERSION)
 
 ifeq (3.5, $(FRAMEWORK_VERSION))
 NAME_SUFFIX = .v3.5
@@ -15,6 +16,7 @@ else
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 NAME_SUFFIX = .v4.0
 ASSEMBLY_VERSION = 4.0.0.0
+INSTALL_FRAMEWORK_VERSION = 4.0
 endif
 endif
 
@@ -34,7 +36,7 @@ install-local:        install-extras
 
 WEBAPP_DIR = Microsoft/VisualStudio/v9.0/WebApplications
 SILVERLIGHT_DIR = $(mono_libdir)/mono/xbuild/Microsoft/Silverlight
-EXTRAS_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
+EXTRAS_DIR = $(mono_libdir)/mono/$(INSTALL_FRAMEWORK_VERSION)
 install-extras: 
        $(MKINSTALLDIRS) $(DESTDIR)$(EXTRAS_DIR) $(DESTDIR)$(REDISTLIST_DIR) $(DESTDIR)$(XBUILD_FRAMEWORKS_DIR)/v3.0/RedistList
        $(INSTALL_DATA) xbuild/xbuild.rsp $(DESTDIR)$(EXTRAS_DIR)