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