From ecab7e451fbc18d245beb8768a532ff99c6fdf0b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Wed, 15 Aug 2007 15:39:44 +0000 Subject: Fix printing the version string when configured with --local. --- .version | 1 + Makefile.in | 2 +- configure | 2 +- ct-ng.in | 6 +++--- version | 1 - 5 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 .version delete mode 100644 version diff --git a/.version b/.version new file mode 100644 index 00000000..01f9d2cc --- /dev/null +++ b/.version @@ -0,0 +1 @@ +0.2.2+svn diff --git a/Makefile.in b/Makefile.in index d8edb2c7..9dc263c6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,7 +96,7 @@ install-lib-main: install-local-test $(LIBDIR) tar cf - --exclude=.svn $${src_dir} |(cd $(LIBDIR); tar xf -); \ done @rm -f $(LIBDIR)/tools/addToolVersion.sh - @for src_file in steps.mk version; do \ + @for src_file in steps.mk .version; do \ echo " INST $${src_file}"; \ install -m 644 $${src_file} $(LIBDIR)/$${src_file}; \ done diff --git a/configure b/configure index 485932d5..151d8b52 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #!/bin/sh -VERSION=$(cat version) +VERSION=$(cat .version) DATE=$(date +%Y%m%d) PREFIX_DEFAULT=/usr/local diff --git a/ct-ng.in b/ct-ng.in index 30b225e4..ebc42603 100644 --- a/ct-ng.in +++ b/ct-ng.in @@ -14,10 +14,10 @@ export CT_LIB_DIR:=@@CT_LIBDIR@@ export CT_DOC_DIR:=@@CT_DOCDIR@@ # This is crosstool-NG version string -export CT_VERSION=$(shell cat $(CT_LIB_DIR)/version) +export CT_VERSION:=$(shell cat $(CT_LIB_DIR)/.version) -export CT_STOP=$(STOP) -export CT_RESTART=$(RESTART) +export CT_STOP:=$(STOP) +export CT_RESTART:=$(RESTART) .PHONY: $(PHONY) PHONY += all diff --git a/version b/version deleted file mode 100644 index 01f9d2cc..00000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -0.2.2+svn -- cgit v1.2.3