Yet another wrong version check
authorMarek Safar <marek.safar@gmail.com>
Wed, 28 Sep 2011 08:30:29 +0000 (09:30 +0100)
committerMarek Safar <marek.safar@gmail.com>
Wed, 28 Sep 2011 08:30:29 +0000 (09:30 +0100)
mcs/class/Moonlight.Build.Tasks/Makefile
mcs/class/System.Dynamic/Makefile

index 7c3511c9066e7df8b84c27238746e63e9875a9c3..5452bf8ed5bb0b9aea7728ee3c2a938bf7d77630 100644 (file)
@@ -5,14 +5,10 @@ include ../../build/rules.make
 LIBRARY = Moonlight.Build.Tasks.dll
 LIBRARY_NAME = Moonlight.Build.Tasks.dll
 
-ifeq (1.0, $(FRAMEWORK_VERSION))
-LIBRARY_NAME = dummy-Moonlight.Build.Tasks.dll
-endif
-
 ifeq (3.5, $(FRAMEWORK_VERSION))
 NAME_SUFFIX = .v3.5
 else
-ifeq (4.0, $(FRAMEWORK_VERSION))
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 NAME_SUFFIX = .v4.0
 endif
 endif
index 5e48b790702bdf7ed7ab5c3ea08372bb27b39a92..faea98dbc8703f79d5aed50de93ec446fdcb15df 100644 (file)
@@ -7,7 +7,7 @@ LIBRARY = System.Dynamic.dll
 LIB_MCS_FLAGS = -unsafe -d:CODEPLEX_40 -r:System.Core.dll -r:System.dll
 
 # This is a .NET 4.0+ only assembly
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Dynamic.dll
 NO_INSTALL = yes