fix typos in def_rules

mk/def_rules.mk

@@ -594,7 +594,7 @@ define PF_TO_FILE_RECIPE =
 	$(eval crtcmd := "$(SCRIPTSPATH)/crtfrmstmf --ccsid $(TGTCCSID)  -f $< -o $(basename $(@F)) -l $(OBJLIB) -c "CRTPF" -p '"$(CRTPFFLAGS)"'")
 	@$(PRESETUP) \
 	$(SCRIPTSPATH)/crtfrmstmf --ccsid $(TGTCCSID) -f $< -o $(basename $(@F)) -l $(OBJLIB) -c "CRTPF" -p "$(CRTPFFLAGS)" --save-joblog "$(JOBLOGFILE)" >> $(LOGFILE) 2>&1 && $(call logSuccess,$@) || $(call logFail,$@)
-	@$(call EVFEVENT_DOWNLOAD,$(basename $@).evfevent)
+	@$(call EVFEVENT_DOWNLOAD,$*.evfevent)
 	@$(TYPEDEF)
 endef
 
@@ -704,16 +704,19 @@ endef
 #  |_|  |_|\___/|____/ \___/|_____|_____| |_| \_\___|\___|_| .__/ \___||___/
 #                                                          |_|              
 
-%.MODULE: private AUT = $(moduleAUT)
-%.MODULE: private DBGVIEW = $(moduleDBGVIEW)
-%.MODULE: private OBJTYPE = $(moduleOBJTYPE)
-%.MODULE: private OPTION = $(moduleOPTION)
-%.MODULE: private INCDIR = $(moduleINCDIR)
-%.MODULE: private RPGPPOPT = $(moduleRPGPPOPT)
-%.MODULE: private STGMDL = $(moduleSTGMDL)
-%.MODULE: private SYSIFCOPT = $(moduleSYSIFCOPT)
-%.MODULE: private TERASPACE = $(moduleTERASPACE)
-%.MODULE: private TGTRLS = $(moduleTGTRLS)
+
+define MODULE_VARIABLES
+	$(eval AUT = $(moduleAUT))\
+	$(eval DBGVIEW = $(moduleDBGVIEW))\
+	$(eval OBJTYPE = $(moduleOBJTYPE))\
+	$(eval OPTION = $(moduleOPTION))\
+	$(eval INCDIR = $(moduleINCDIR))\
+	$(eval RPGPPOPT = $(moduleRPGPPOPT))\
+	$(eval STGMDL = $(moduleSTGMDL))\
+	$(eval SYSIFCOPT = $(moduleSYSIFCOPT))\
+	$(eval TERASPACE = $(moduleTERASPACE))\
+	$(eval TGTRLS = $(moduleTGTRLS))
+endef
 
 define C_TO_MODULE_RECIPE = 
 	$(MODULE_VARIABLES)
@@ -849,7 +852,7 @@ define CBL_TO_PGM_RECIPE =
 	$(PGM_VARIABLES)
 	$(eval d = $($@_d))
 	@$(call echo_cmd,"=== Create COBOL Program [$(basename $@)]")
-	$(eval crtcmd := "$(SCRIPTSPATH)/crtfrmstm --ccsid $(TGTCCSID) -f $< -o $(basename $(@F)) -l $(OBJLIB) -c "CRTPRTF" -p '"$(CRTPRTFFLAGS)"'")
+	$(eval crtcmd := "$(SCRIPTSPATH)/crtfrmstmf --ccsid $(TGTCCSID) -f $< -o $(basename $(@F)) -l $(OBJLIB) -c "CRTPRTF" -p '"$(CRTPRTFFLAGS)"'")
 	@$(PRESETUP) \
 	$(SCRIPTSPATH)/crtfrmstmf --ccsid $(TGTCCSID)  -f $< -o $(basename $(@F)) -l $(OBJLIB) -c "CRTPRTF" -p "$(CRTPRTFFLAGS)" --save-joblog "$(JOBLOGFILE)" >> $(LOGFILE) 2>&1 && $(call logSuccess,$@) || $(call logFail,$@)
 	@$(call EVFEVENT_DOWNLOAD,$*.evfevent)
@@ -1024,7 +1027,7 @@ define WSCSTSRC_TO_WSCST_RECIPE =
 	@$(set_STMF_CCSID)
 	$(eval crtcmd := "$(SCRIPTSPATH)/crtfrmstmf --ccsid $(TGTCCSID)  -f $< -o $(basename $(@F)) -l $(OBJLIB) -c "CRTWSCST" -p '"$(CRTWSCSTFLAGS)"'")
 	@$(PRESETUP) \
-	$(SCRIPTSPATH)/crtfrmstmf  --ccsid $(TGTCCSID) -f $< -o $(basename $(@F)) -l $(OBJLIB) -c "CRTWSCST" -p "$(CRTWSCSTFLAGS)" --save-joblog "$(JOBLOGFILE)" >> $(LOGFILE) 2>&1 && $(call logSuccess,$@) || $(call logFail,$@)
+	$(SCRIPTSPATH)/crtfrmstmf --ccsid $(TGTCCSID) -f $< -o $(basename $(@F)) -l $(OBJLIB) -c "CRTWSCST" -p "$(CRTWSCSTFLAGS)" --save-joblog "$(JOBLOGFILE)" >> $(LOGFILE) 2>&1 && $(call logSuccess,$@) || $(call logFail,$@)
 endef
 
 define QMQRY_VARIABLES =