Makefile

@@ -14,49 +14,22 @@
 #
 # Makefile for Territory modules
 #
-# ***********************************
-# ***    C h a n g e   L i s t    ***
-# ***********************************
-# Date       Name         Description
-# ----       ----         -----------
-# 21-Mar-01  SNB          Recreated.
 
-#
-# Program specific options:
-#
-COMPONENT ?= UK
-TARGET    ?= ${COMPONENT}
-
-ROM_SOURCE = Territory.s
-ASFLAGS = -PD "Territory SETS \"${TARGET}\""
+COMPONENT  ?= UK
+ROM_SOURCE  = Territory.s
+ASFLAGS     = -PD "Territory SETS \"${TARGET}\""
+CUSTOMRES   = custom
 
-RESOURCES   = -private
-PRIVATEMSGS = -private
-
-#
-# Generic options:
-#
 include StdTools
 include AAsmModule
 
-#
-# Generic rules:
-#
-${MERGEDMSGS}: Resources.${TARGET}.Territory LocalRes:Messages
-	${MKDIR} ${MERGEDMDIR}
-	${CP} Resources.${TARGET}.Territory $@ ${CPFLAGS}
-	${CAT} LocalRes:Messages { >> $@ }
+${MERGEDMSGS}::
+	${MKDIR} ${MERGEDRDIR}${SEP}${TARGET}
+	${FAPPEND} $@ Resources${SEP}${LOCALE}${SEP}Messages Resources${SEP}${TARGET}${SEP}Territory
 
 resources: ${MERGEDMSGS}
 	${MKDIR} ${RESFSDIR}
-	${CP} ${MERGEDMSGS} ${RESFSDIR}.Messages ${CPFLAGS}
+	${CP} ${MERGEDMSGS} ${RESFSDIR}${SEP}Messages ${CPFLAGS}
 	@${ECHO} ${COMPONENT}: resources copied to Messages module
 
-# BBE Rules
-BBETYPE   = local
-bbe-local: bbe-generic-resources-get-alias
-	BBE_Export_File_In_Dir ${MERGEDMDIR} ${TARGET}
-	BBE_Export_File VersionNum
-
-
 # Dynamic dependencies:

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "0.60"
-Module_Version          SETA    60
+Module_MajorVersion     SETS    "0.61"
+Module_Version          SETA    61
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "26 Nov 2013"
-Module_ApplicationDate  SETS    "26-Nov-13"
+Module_Date             SETS    "29 May 2016"
+Module_ApplicationDate  SETS    "29-May-16"
 Module_ComponentName    SETS    "Module"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Internat/Territory/Module"
-Module_FullVersion      SETS    "0.60"
-Module_HelpVersion      SETS    "0.60 (26 Nov 2013)"
+Module_FullVersion      SETS    "0.61"
+Module_HelpVersion      SETS    "0.61 (29 May 2016)"
                         END

VersionNum

-/* (0.60)
+/* (0.61)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.60
+#define Module_MajorVersion_CMHG        0.61
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                26 Nov 2013
+#define Module_Date_CMHG                29 May 2016
 
-#define Module_MajorVersion             "0.60"
-#define Module_Version                  60
+#define Module_MajorVersion             "0.61"
+#define Module_Version                  61
 #define Module_MinorVersion             ""
-#define Module_Date                     "26 Nov 2013"
+#define Module_Date                     "29 May 2016"
 
-#define Module_ApplicationDate          "26-Nov-13"
+#define Module_ApplicationDate          "29-May-16"
 
 #define Module_ComponentName            "Module"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Internat/Territory/Module"
 
-#define Module_FullVersion              "0.60"
-#define Module_HelpVersion              "0.60 (26 Nov 2013)"
-#define Module_LibraryVersionInfo       "0:60"
+#define Module_FullVersion              "0.61"
+#define Module_HelpVersion              "0.61 (29 May 2016)"
+#define Module_LibraryVersionInfo       "0:61"