--- a/javamanager/javainstaller/subsystem.mk	Thu May 27 12:49:31 2010 +0300
+++ b/javamanager/javainstaller/subsystem.mk	Fri Jun 11 13:33:44 2010 +0300
@@ -20,17 +20,14 @@
 	installerui/build \
 	installer/build \
 
-NONQTSUBSYSTEMS = \
-	appinstuiplugin/build
-
-SYMBIAN_ONLY = \
-	appinstuiplugin/build
+ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+    NONQTSUBSYSTEMS = javasifplugin/build
+    SYMBIAN_ONLY = javasifplugin/build
+else
+    NONQTSUBSYSTEMS = appinstuiplugin/build
+    SYMBIAN_ONLY = appinstuiplugin/build
+endif
 
-ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK    
-    NONQTSUBSYSTEMS += javasifplugin/build
-    SYMBIAN_ONLY += javasifplugin/build
-endif
-    
 LINUX_ONLY =
 
 include ${JAVA_SRC_ROOT}/build/Makefile.subsystem