Index: trunk/i386/libsaio/console.c
===================================================================
--- trunk/i386/libsaio/console.c	(revision 914)
+++ trunk/i386/libsaio/console.c	(revision 915)
@@ -46,6 +46,7 @@
 
 #include "libsaio.h"
 #include "bootstruct.h"
+#include <vers.h>
 
 extern int	vprf(const char * fmt, va_list ap);
 
@@ -90,6 +91,7 @@
 	msgbuf = malloc(BOOTER_LOG_SIZE);
 	bzero(msgbuf, BOOTER_LOG_SIZE);
 	cursor = msgbuf;
+	msglog("%s\n", "Chameleon " I386BOOT_CHAMELEONVERSION " (svn-r" I386BOOT_CHAMELEONREVISION ")" " [" I386BOOT_BUILDDATE "]");
 }
 
 void msglog(const char * fmt, ...)
Index: trunk/i386/libsaio/ati.c
===================================================================
--- trunk/i386/libsaio/ati.c	(revision 914)
+++ trunk/i386/libsaio/ati.c	(revision 915)
@@ -539,6 +539,7 @@
 	uint8_t					*rom;
 	uint32_t				rom_size;
 	uint32_t				vram_size;
+	const char				*cfg_name;
 	uint8_t					ports;
 	uint32_t				flags;
 	bool					posted;
@@ -1100,7 +1101,6 @@
 
 static bool init_card(pci_dt_t *pci_dev)
 {
-	const char *fb_name;
 	char name[24];
 	char name_parent[24];
 	int i;
@@ -1164,25 +1164,25 @@
 
 	atN = 0;
 
-	fb_name = getStringForKey(kAtiConfig, &bootInfo->bootConfig);
-	if (!fb_name)
+	card->cfg_name = getStringForKey(kAtiConfig, &bootInfo->bootConfig);
+	if (!card->cfg_name)
 	{
-		fb_name = card_configs[card->info->cfg_name].name;
+		card->cfg_name = card_configs[card->info->cfg_name].name;
 		card->ports = card_configs[card->info->cfg_name].ports;
 	}
 	else
 	{
 		for (i = 0; i < kCfgEnd; i++)
-			if (strcmp(fb_name, card_configs[i].name) == 0)
+			if (strcmp(card->cfg_name, card_configs[i].name) == 0)
 				card->ports = card_configs[i].ports;
 	}
 
-	sprintf(name, "ATY,%s", fb_name);
+	sprintf(name, "ATY,%s", card->cfg_name);
 	aty_name.type = kStr;
 	aty_name.size = strlen(name) + 1;
 	aty_name.data = (uint8_t *)name;
 
-	sprintf(name_parent, "ATY,%sParent", fb_name);
+	sprintf(name_parent, "ATY,%sParent", card->cfg_name);
 	aty_nameparent.type = kStr;
 	aty_nameparent.size = strlen(name_parent) + 1;
 	aty_nameparent.data = (uint8_t *)name_parent;
@@ -1228,7 +1228,7 @@
 
 	verbose("ATI %s %s %dMB (%s) [%04x:%04x] (subsys [%04x:%04x]):: %s\n",  
 			chip_family_name[card->info->chip_family], card->info->model_name, 
-			(uint32_t)(card->vram_size / (1024 * 1024)), card_configs[card->info->cfg_name].name, 
+			(uint32_t)(card->vram_size / (1024 * 1024)), card->cfg_name, 
 			ati_dev->vendor_id, ati_dev->device_id,
 			ati_dev->subsys_id.subsys.vendor_id, ati_dev->subsys_id.subsys.device_id, 
 			devicepath);
Index: trunk/i386/boot2/Makefile
===================================================================
--- trunk/i386/boot2/Makefile	(revision 914)
+++ trunk/i386/boot2/Makefile	(revision 915)
@@ -156,12 +156,6 @@
 	@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
 
 	
-$(SYMROOT)/vers.h:
-	@echo "#define I386BOOT_VERSION \"5.0.132\"" > $(SYMROOT)/vers.h
-	@echo "#define I386BOOT_BUILDDATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $(SYMROOT)/vers.h
-	@echo "#define I386BOOT_CHAMELEONVERSION \"`cat ../../version`\"" >> $(SYMROOT)/vers.h
-	@echo "#define I386BOOT_CHAMELEONREVISION \"`svnversion -n | tr -d [:alpha:]`\"" >> $(SYMROOT)/vers.h
-
 $(SYMROOT)/art.h:
 	@if [ "$(PNGCRUSH)" ]; then	\
 		echo "optimizing art files ...\n$(PNGCRUSH) $(PNGOPTIONS) artwork/$(THEME)"; \
Index: trunk/Makefile
===================================================================
--- trunk/Makefile	(revision 914)
+++ trunk/Makefile	(revision 915)
@@ -50,7 +50,7 @@
 	) || exit $$?; 						  \
 
 
-all: $(SYMROOT) $(OBJROOT) $(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/autoconf.inc $(SRCROOT)/.config
+all: $(SYMROOT) $(OBJROOT) $(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/autoconf.inc $(SRCROOT)/.config vers.h
 	@if [ -e ".svn" ]; then svnversion -n | tr -d [:alpha:] > revision; fi
 	@if [ -z "$(RC_ARCHS)" ]; then					  \
 		RC_ARCHS="i386";					  \
@@ -89,7 +89,13 @@
 	    fi;								  \
 	done
 
+vers.h:
+	@echo "#define I386BOOT_VERSION \"5.0.132\"" > $(SYMROOT)/i386/vers.h
+	@echo "#define I386BOOT_BUILDDATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $(SYMROOT)/i386/vers.h
+	@echo "#define I386BOOT_CHAMELEONVERSION \"`cat version`\"" >> $(SYMROOT)/i386/vers.h
+	@echo "#define I386BOOT_CHAMELEONREVISION \"`svnversion -n | tr -d [:alpha:]`\"" >> $(SYMROOT)/i386/vers.h
 
 
+
 .PHONY: config
 .PHONY: clean