diff --git a/windows_deliv/make_installations.btm b/windows_deliv/make_installations.btm
index 7808cae..02de4cf 100644
--- a/windows_deliv/make_installations.btm
+++ b/windows_deliv/make_installations.btm
@@ -59,7 +59,7 @@ iff .%1.==.. then
 	remtrace Recompile Custom actions for installation program
 	remtrace ==================================================
 
-	iff not defined NO_ENTERPRISE_BUILD then
+	if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
 		cdd %EIFFEL_SRC
 		cd tools
 		if EXIST %INIT_DIR%\isesvn\tools\setup (
@@ -81,7 +81,7 @@ iff .%1.==.. then
 		safe_md %INIT_DIR\install\binaries
 		safe_md %INIT_DIR\install\binaries\%WINNAME
 		move setup.dll %INIT_DIR\install\binaries\%WINNAME
-	endiff
+	)
 endiff
 
 remtrace ==============================================
@@ -105,13 +105,13 @@ if "%NO_GPL_BUILD%" NEQ "True" (
 	safe_copy %INIT_DIR\install\bin\studio_gpl_%WINNAME\package.msi %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.msi
 )
 
-iff not defined NO_ENTERPRISE_BUILD then
+if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
 	remtrace Preparing Commercial edition
 	remtrace Clean previous ENT WIX files
 	fullrd %INIT_DIR%\install\bin\studio_ent_%WINNAME%
 	espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo enterprise_%WINNAME"
 	safe_copy %INIT_DIR\install\bin\studio_ent_%WINNAME\package.msi %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.msi
-endiff
+)
 
 
 remtrace ==============================================
@@ -131,7 +131,7 @@ if "%NO_GPL_BUILD%" NEQ "True" (
 	7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
 )
 
-iff not defined NO_ENTERPRISE_BUILD then
+if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
 	remtrace Enterprise archive
 	safe_copy %INSTALL_DIR\releases\enterprise_version\ec.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
 	safe_copy %INSTALL_DIR\releases\enterprise_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
@@ -141,7 +141,7 @@ iff not defined NO_ENTERPRISE_BUILD then
 		remtrace Missing Enterprise license text
 	endiff
 	7z a -t7z %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
-endiff
+)
 
 remtrace Restoring the layout to its original state
 cdd %INSTALL_DIR