diff --git a/Makefile b/Makefile
index 994b668a830d50ba6a843b682a7fc3a7b0cc24e3..a75ff69ba615c76609f21bd866123139332935f8 100644
--- a/Makefile
+++ b/Makefile
@@ -140,8 +140,10 @@
LIBDIR = C:
MKDIR = do mkdir -p
AS = objasm
+AWK = GNU.gawk
CMHG = cmhg
CP = copy
+INSERTVERSION = ${AWK} -f Build:AwkVers
LD = link
RM = remove
SQUEEZE = squeeze
@@ -735,7 +737,7 @@ install_common: ${FILES}
${CP} ${LDIR}.8desktop ${INSTDIR}.8desktop ${CPFLAGS}n
${CP} ${LDIR}.Choices ${INSTDIR}.Choices ${CPFLAGS}n
${CP} ${LDIR}.Controls ${INSTDIR}.Controls ${CPFLAGS}n
- ${CP} ${LDIR}.Messages ${INSTDIR}.Messages ${CPFLAGS}n
+ ${INSERTVERSION} ${LDIR}.Messages > ${INSTDIR}.Messages
${CP} ${LDIR}.Sprites ${INSTDIR}.Sprites ${CPFLAGS}n
-${CP} ${LDIR}.Sprites22 ${INSTDIR}.Sprites22 ${CPFLAGS}n
-${CP} ${LDIR}.Sprites23 ${INSTDIR}.Sprites23 ${CPFLAGS}n
@@ -840,7 +842,7 @@ resources:
-${CP} ${LDIR}.5Sprites22 ${RESDIR}.5Sprites22 ${CPFLAGS}
${CP} ${LDIR}.Choices ${RESDIR}.Choices ${CPFLAGS}
${CP} ${LDIR}.Controls ${RESDIR}.Controls ${CPFLAGS}
- ${CP} ${LDIR}.Messages ${RESDIR}.Messages ${CPFLAGS}
+ ${INSERTVERSION} ${LDIR}.Messages > ${RESDIR}.Messages
${CP} ${LDIR}.Res ${RESDIR}.Res ${CPFLAGS}
${CP} ${LDIR}.Sprites ${RESDIR}.Sprites ${CPFLAGS}
-${CP} ${LDIR}.Sprites22 ${RESDIR}.Sprites22 ${CPFLAGS}
diff --git a/Resources/UK/Browse/Messages b/Resources/UK/Browse/Messages
index f8890aa5fe0d34e2af1b9d577b1241aa9b887699..7b0a42d3c26289f18df6e30ab23fa115f9d849ff 100644
--- a/Resources/UK/Browse/Messages
+++ b/Resources/UK/Browse/Messages
@@ -3,7 +3,7 @@
_TaskName:Browse
_SpriName:!browse
-Version:2.15 (24 Apr 2009)
+_Version:Auto-maintained
FullName:Acorn Browse
DAGen:- General
DAJSc:- JavaScript
diff --git a/Resources/UK/Phoenix/Messages b/Resources/UK/Phoenix/Messages
index 8aad5ece6d9c1e089589e61761b21775351e41d4..65b055c96268717c08823dc755e37fb0fabec699 100644
--- a/Resources/UK/Phoenix/Messages
+++ b/Resources/UK/Phoenix/Messages
@@ -3,7 +3,7 @@
_TaskName:Phoenix
_SpriName:!phoenix
-Version:2.15 (24 Apr 2009)
+_Version:Auto-maintained
FullName:Phoenix
DAGen:- General
DAJSc:- JavaScript
diff --git a/Resources/UK/Ursula/Messages b/Resources/UK/Ursula/Messages
index 0325c17e57bcab83ea2fd4e3c50e498e079ad7a2..bf709343afac7a67918bbfc08b485ca2682f1539 100644
--- a/Resources/UK/Ursula/Messages
+++ b/Resources/UK/Ursula/Messages
@@ -3,7 +3,7 @@
_TaskName:Browse
_SpriName:!browse
-Version:2.15 (24 Apr 2009)
+_Version:Auto-maintained
FullName:Acorn Browse
DAGen:- General
DAJSc:- JavaScript
diff --git a/c/About b/c/About
index 44dded31bee62fc19e08bf39314638a9c164a41f..e87464e7bb0fdcda0a44b8de09ba7a1f079c0c5c 100644
--- a/c/About
+++ b/c/About
@@ -499,7 +499,7 @@ _kernel_oserror * about_build_page(void ** block)
/* move the final string down into place. */
len = strlen(lookup_token("paboutbrw",1,0)) + 1;
- len += strlen(lookup_token("Version", 1,0)) * 2 + 1;
+ len += strlen(lookup_token("_Version", 1,0)) * 2 + 1;
if (!flex_extend(block, output_size + len)) goto panic;
diff --git a/c/Handlers b/c/Handlers
index 7f6caa6f16b64ed1f5b3eea484cb9933c92da443..4f043c0b4128b5c0ae92a577ef0e3df4d224c6e1 100644
--- a/c/Handlers
+++ b/c/Handlers
@@ -3677,7 +3677,7 @@ int handle_show_info(int eventcode, ToolboxEvent * event, IdBlock * idb, void *
#endif
- lookup_token("Version:(Unknown!)",1,0);
+ lookup_token("_Version:(Unknown!)",1,0);
#ifndef SINGLE_USER
diff --git a/c/JSnavigtr b/c/JSnavigtr
index da9565d9c781322d96a2f31f28ae025aca85823c..936c5d345f43bca8833429c703c6ceea45c73674 100644
--- a/c/JSnavigtr
+++ b/c/JSnavigtr
@@ -293,7 +293,7 @@
nav->appCodeName = JS_NewStringCopyZ(cx, lookup_token("_TaskName:Browse",0,0));
if (nav->appCodeName) JS_LockGCThing(cx, nav->appCodeName);
- nav->appVersion = JS_NewStringCopyZ(cx, lookup_token("Version:(Unknown!)",0,0));
+ nav->appVersion = JS_NewStringCopyZ(cx, lookup_token("_Version:(Unknown!)",0,0));
if (nav->appVersion) JS_LockGCThing(cx, nav->appVersion);
nav->appName = JS_NewStringCopyZ(cx, lookup_token("FullName:Acorn Browse",0,0));
diff --git a/c/Menus b/c/Menus
index c4d11bab6e14aa6969ebb63748bca7c494e7d831..cdc912faa4be028690642021d93f20429a98a289 100644
--- a/c/Menus
+++ b/c/Menus
@@ -1842,7 +1842,7 @@ int menus_help_release_notes(int eventcode, ToolboxEvent * event, IdBlock * idb,
*tokens = '\0';
*lasttokn = '\0';
- lookup_token("Version",1,0);
+ lookup_token("_Version",1,0);
if (strlen(tokens) + strlen(help) + sizeof(".html") > sizeof(help)) return 0;
diff --git a/c/PlugIn b/c/PlugIn
index 3258e08bef7b7aaadad6cadef78f437b1293e734..6e84c06b9c4118be4b14da70e988854b0308d25f 100644
--- a/c/PlugIn
+++ b/c/PlugIn
@@ -481,7 +481,7 @@ _kernel_oserror * plugin_write_params
if (e) goto plugin_write_params_exit;
- data = lookup_token("Version", 1, 0);
+ data = lookup_token("_Version", 1, 0);
StrNCpy0(version, data);
e = plugin_write_params_entry(fh,
diff --git a/c/Save b/c/Save
index a1a0df0ed61f6f3bbff8f1f4d3d206796d3b1026..cb8b65ccd6c6f1c14b0cc96df924a4ec1d79e6b3 100644
--- a/c/Save
+++ b/c/Save
@@ -582,7 +582,7 @@ _kernel_oserror * save_save_uri(char * path, char * url, char * title, int write
else if (
fprintf(file,
"%s\n\n\t%s",
- lookup_token("Version:(Unknown!)",0,0),
+ lookup_token("_Version:(Unknown!)",0,0),
url) < 0
)
{
@@ -730,7 +730,7 @@ _kernel_oserror * save_transfer_uri(char * url, char * title, int write_url, int
written += sprintf(uri_file + written,
"%s\n\n\t%s",
- lookup_token("Version:(Unknown!)",0,0),
+ lookup_token("_Version:(Unknown!)",0,0),
url);
written += sprintf(uri_file + written,
@@ -840,7 +840,7 @@ int save_uri_size(char * url, char * title, int write_url)
len += strlen(lookup_token("_TaskName",1,0));
len += strlen(" v");
- len += strlen(lookup_token("Version:(Unknown!)",0,0));
+ len += strlen(lookup_token("_Version:(Unknown!)",0,0));
len += strlen("\n\n\t");
len += strlen(url);
diff --git a/c/Utils b/c/Utils
index dd39ff54ccf25e3f14be617ee675bb3edcaef455..99fc9a7bb9289b76cd9698f918af70cfe9cbcc16 100644
--- a/c/Utils
+++ b/c/Utils
@@ -3078,7 +3078,7 @@ void utils_build_user_agent_string(int netscape, char * buffer, int buffer_size)
*lasttokn = 0;
*tokens = 0;
- lookup_token("Version",1,0);
+ lookup_token("_Version",1,0);
/* Just do a simple version outside of the comment field */