diff -r 4d70a3cb95ee -r 68355697fc84 ApplicationDefinition.st
--- a/ApplicationDefinition.st	Thu Mar 03 09:51:06 2016 +0000
+++ b/ApplicationDefinition.st	Mon Mar 07 08:08:02 2016 +0000
@@ -1765,7 +1765,7 @@
 
 #
 APPNAME=%(LIBRARY_NAME)
-LIBNAME=dummy
+LIBNAME=%(LIBRARY_NAME)
 MODULE_PATH=%(MODULE_PATH)
 STCOPT="+optinline"
 LOCALINCLUDES=%(LOCAL_INCLUDES)
@@ -2007,9 +2007,9 @@
 # ENDMAKEDEPEND --- do not remove this line
 %(ADDITIONAL_RULES_HG)'.
 
-    "Modified: / 22-11-2012 / 17:18:28 / cg"
     "Modified: / 02-06-2015 / 17:40:03 / gg"
     "Modified: / 26-01-2016 / 14:23:35 / jv"
+    "Modified: / 03-03-2016 / 21:15:43 / cg"
 !
 
 bc_dot_mak_app_source_rules
@@ -2861,7 +2861,7 @@
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
 SectionEnd
 
-LangString appOpen ${LANG_GERMAN}  "Mit %(PRODUCT_NAME) öffnen"
+LangString appOpen ${LANG_GERMAN}  "Mit %(PRODUCT_NAME) ffnen"
 LangString appOpen ${LANG_ENGLISH} "Open with %(PRODUCT_NAME)"
 
 LangString DESC_Section1 ${LANG_ENGLISH} "Program components of %(PRODUCT_NAME)"
@@ -2895,7 +2895,7 @@
 
 Function un.onInit
 !!insertmacro MUI_UNGETLANGUAGE
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie %(PRODUCT_NAME) und alle seine Komponenten deinstallieren?" IDYES +2
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Mchten Sie %(PRODUCT_NAME) und alle seine Komponenten deinstallieren?" IDYES +2
   Abort
 FunctionEnd
 
@@ -2994,15 +2994,17 @@
 !
 
 preRequisiteLine_bc_dot_mak
+    "Note: the trailing blank in 'CFLAGS_LOCAL=$(GLOBALDEFINES) '
+     is required!!"
     ^
 '%(FILE_NAME).dll: %(MODULE_DIRECTORY)\$(OBJDIR)\%(FILE_NAME).dll
         copy %(MODULE_DIRECTORY)\$(OBJDIR)\%(FILE_NAME).dll *.*
 
 %(MODULE_DIRECTORY)\$(OBJDIR)\%(FILE_NAME).dll: $(FORCE)
-        pushd %(MODULE_DIRECTORY) & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+        pushd %(MODULE_DIRECTORY) & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 '
 
-    "Modified: / 26-07-2010 / 12:26:10 / cg"
+    "Modified: / 03-03-2016 / 21:22:21 / cg"
 !
 
 preRequisiteLine_make_dot_proto
@@ -3029,26 +3031,34 @@
 !
 
 subProjectLine_bc_dot_mak
+    "Note: the trailing blank in 'CFLAGS_LOCAL=$(GLOBALDEFINES) '
+     is required!!"
+
 ^'%(LIBRARY_NAME).dll: %(PATH_TO_SUB_PROJECT)\$(OBJDIR)\%(LIBRARY_NAME).dll
         copy %(PATH_TO_SUB_PROJECT)\$(OBJDIR)\%(LIBRARY_NAME).dll *.*
 
 %(PATH_TO_SUB_PROJECT)\$(OBJDIR)\%(LIBRARY_NAME).dll:
-        pushd %(PATH_TO_SUB_PROJECT) & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+        pushd %(PATH_TO_SUB_PROJECT) & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 '
 
-    "Modified: / 26-07-2010 / 12:26:01 / cg"
+    "Modified: / 03-03-2016 / 21:23:00 / cg"
 !
 
 subProjectLine_make_dot_proto
+    "Note: the trailing blank in 'CFLAGS_LOCAL=$(GLOBALDEFINES) '
+     is required!!"
+
 ^'%(LIBRARY_NAME).so: %(PATH_TO_SUB_PROJECT)/%(LIBRARY_NAME).so
         ln -sf %(PATH_TO_SUB_PROJECT)/%(LIBRARY_NAME).so .
 
 %(PATH_TO_SUB_PROJECT)/%(LIBRARY_NAME).so: %(PATH_TO_SUB_PROJECT)/makefile
-        cd %(PATH_TO_SUB_PROJECT) && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+        cd %(PATH_TO_SUB_PROJECT) && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 %(PATH_TO_SUB_PROJECT)/makefile: %(PATH_TO_SUB_PROJECT)/Make.proto
         $(TOP)/rules/stmkmf --cd %(PATH_TO_SUB_PROJECT)
 '
+
+    "Modified: / 03-03-2016 / 21:23:10 / cg"
 !
 
 undefineExtenionLine_nsi_for:extension