diff -r e5618cc85d74 -r 6c158198356e javamanager/javainstaller/subsystem.mk --- a/javamanager/javainstaller/subsystem.mk Thu Jul 15 18:31:06 2010 +0300 +++ b/javamanager/javainstaller/subsystem.mk Thu Aug 19 09:48:13 2010 +0300 @@ -20,17 +20,19 @@ installerui/build \ installer/build \ -NONQTSUBSYSTEMS = \ - appinstuiplugin/build - -SYMBIAN_ONLY = \ - appinstuiplugin/build +ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK + NONQTSUBSYSTEMS = javasifplugin/build + SYMBIAN_ONLY = javasifplugin/build + COMPONENTS += installcopier/build +else + NONQTSUBSYSTEMS = appinstuiplugin/build + SYMBIAN_ONLY = appinstuiplugin/build +ifndef RD_JAVA_S60_RELEASE_5_0_IAD + NONQTSUBSYSTEMS += iconsizenotifplugin/build + SYMBIAN_ONLY += iconsizenotifplugin/build +endif +endif -ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK - NONQTSUBSYSTEMS += javasifplugin/build - SYMBIAN_ONLY += javasifplugin/build -endif - LINUX_ONLY = include ${JAVA_SRC_ROOT}/build/Makefile.subsystem