From 0469efb733fc3e18b0014cdfc963c103d6d21579 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 4 Jun 2013 09:56:05 -0500 Subject: [PATCH] build_tools/make_version: Fix typo in build_tools/make_version. The make_version script would test for a .version file in the proper location, but then would not properly read it. Since make_version is always reading the .version script correctly now, the Makefile can be slightly simpilfied and always defer to it. This has no user impact since build_tools/make_version was never used to read the .version file previously but will allow external scripts to use the make_version script. Signed-off-by: Shaun Ruffell Signed-off-by: Russ Meyerriecks --- Makefile | 6 +----- build_tools/make_version | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 6fddf5f..6a4d873 100644 --- a/Makefile +++ b/Makefile @@ -64,11 +64,7 @@ ASCIIDOC_CMD:=$(ASCIIDOC) -n -a toc -a toclevels=4 GENERATED_DOCS:=README.html -ifneq ($(wildcard .version),) - DAHDIVERSION:=$(shell cat .version) -else - DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux) -endif +DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux) all: modules diff --git a/build_tools/make_version b/build_tools/make_version index 8eb2299..319842b 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -1,7 +1,7 @@ #!/bin/sh if [ -f ${1}/.version ]; then - cat ${1}.version + cat ${1}/.version elif [ -f ${1}/.svnrevision ]; then echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision` elif [ -d ${1}/.svn ]; then