Kernel - Updated makefiles to provide a better version number

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 0b79233..0dee58d 100644 (file)
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -14,7 +14,7 @@ ifeq ($(BUILD_NUM),)
 BUILD_NUM = 0
 endif
 
-KERNEL_VERSION = 0.5
+KERNEL_VERSION = $(ACESS_VERSION)
 
 MAKEDEP                = $(CC) -M
 

diff --git a/Kernel/drv/proc.c b/Kernel/drv/proc.c
index 75d9e1f..3283c86 100644 (file)
--- a/Kernel/drv/proc.c
+++ b/Kernel/drv/proc.c
@@ -104,7 +104,7 @@ tSysFS_Ent  *gSysFS_FileList;
 int SysFS_Install(char **Options)
 {
        {
-               const char      *fmt = "Acess2 "EXPAND_STR(KERNEL_VERSION)" build %i, hash %s";
+               const char      *fmt = "Acess2 "EXPAND_STR(KERNEL_VERSION)" "EXPAND_STR(ARCHDIR)" build %i, hash %s";
                gSysFS_Version_Kernel.Node.Size = sprintf(NULL, fmt, BUILD_NUM, gsGitHash);
                gSysFS_Version_Kernel.Node.ImplPtr = malloc( gSysFS_Version_Kernel.Node.Size + 1 );
                sprintf(gSysFS_Version_Kernel.Node.ImplPtr, fmt, BUILD_NUM, gsGitHash);

diff --git a/Makefile.Version.cfg b/Makefile.Version.cfg
index e652f57..292934a 100644 (file)
--- a/Makefile.Version.cfg
+++ b/Makefile.Version.cfg
@@ -1,3 +1,7 @@
 
-ACESS_VERSION = 0.14-pr
+ACESS_VERSION = 0.14
+
+ifeq ($(BUILD_DIST),y)
+       ACESS_VERSION := $(ACESS_VERSION)-rel
+endif