# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1179083029 0
# Node ID f67b52e42fd1aebf594e32dfc1a7dc6db8adfdec
# Parent  adb773fccc6b71721cb1097068bb80a0af92089b
Correctly handle the version string, defined in a single place now.
Fix and update README.

diff -r adb773fccc6b -r f67b52e42fd1 Makefile
--- a/Makefile	Sat May 12 09:54:29 2007 +0000
+++ b/Makefile	Sun May 13 19:03:49 2007 +0000
@@ -4,11 +4,10 @@
 # Don't print directory as we descend into them
 MAKEFLAGS += --no-print-directory
 
-# The project version
-export PROJECTVERSION=0.0.2-svn
+export CT_TOP_DIR=$(shell pwd)
 
-# This should eventually be computed if compiling out-of-tree is implemented
-export CT_TOP_DIR=$(shell pwd)
+# This is crosstool-ng version string
+export CT_VERSION=$(shell cat $(CT_TOP_DIR)/version)
 
 .PHONY: all
 all: build
diff -r adb773fccc6b -r f67b52e42fd1 README
--- a/README	Sat May 12 09:54:29 2007 +0000
+++ b/README	Sun May 13 19:03:49 2007 +0000
@@ -1,9 +1,9 @@
 This is the README for crosstool-NG
 
-To get you started, hust enter:
+To get you started, just enter:
   make help
 
 You can find a (terse and WIP) documentation in docs/.
 
 You can also point your browser to
-  http://ymorin.is-a-geek.org/dokuwiki/doku.php?id=projects:crosstool
+  http://ymorin.is-a-geek.org/dokuwiki/projects/crosstool
diff -r adb773fccc6b -r f67b52e42fd1 kconfig/Makefile
--- a/kconfig/Makefile	Sat May 12 09:54:29 2007 +0000
+++ b/kconfig/Makefile	Sun May 13 19:03:49 2007 +0000
@@ -16,6 +16,9 @@
 CFLAGS += -DKBUILD_NO_NLS
 endif
 
+# Derive the project version from, well, the project version:
+export PROJECTVERSION=$(CT_VERSION)
+
 menuconfig: $(obj)/mconf
 	@$< $(KCONFIG_TOP)
 
diff -r adb773fccc6b -r f67b52e42fd1 scripts/crosstool.sh
--- a/scripts/crosstool.sh	Sat May 12 09:54:29 2007 +0000
+++ b/scripts/crosstool.sh	Sun May 13 19:03:49 2007 +0000
@@ -182,7 +182,7 @@
 CT_SYS_USER="`id -un`"
 CT_SYS_DATE=`CT_DoDate +%Y%m%d.%H%M%S`
 CT_SYS_GCC=`gcc -dumpversion`
-CT_TOOLCHAIN_ID="crosstool-${CT_VERSION} build ${CT_SYS_DATE} by ${CT_SYS_USER}@${CT_SYS_HOSTNAME} for ${CT_TARGET}"
+CT_TOOLCHAIN_ID="crosstool-${CT_VERSION} build ${CT_SYS_DATE} by ${CT_SYS_USER}@${CT_SYS_HOSTNAME}"
 
 # Redirect log to the actual log file now we can
 # It's quite understandable that the log file will be installed in the install
diff -r adb773fccc6b -r f67b52e42fd1 scripts/functions
--- a/scripts/functions	Sat May 12 09:54:29 2007 +0000
+++ b/scripts/functions	Sun May 13 19:03:49 2007 +0000
@@ -20,9 +20,6 @@
 set -E
 set -o pipefail
 
-# This is crosstool-ng-0.0.1
-CT_VERSION=ng-0.0.1
-
 # The different log levels:
 CT_LOG_LEVEL_ERROR=0
 CT_LOG_LEVEL_WARN=1
diff -r adb773fccc6b -r f67b52e42fd1 version
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/version	Sun May 13 19:03:49 2007 +0000
@@ -0,0 +1,1 @@
+0.0.2-svn