Build: Rework git version detection

[openafs.git] / src / config / Makefile.version-NOCML.in

diff --git a/src/config/Makefile.version-NOCML.in b/src/config/Makefile.version-NOCML.in
index 0d612dd..c5613ff 100644 (file)
--- a/src/config/Makefile.version-NOCML.in
+++ b/src/config/Makefile.version-NOCML.in
@@ -6,18 +6,19 @@
 # directory or online at http://www.openafs.org/dl/license10.html
 
 PACKAGE=@PACKAGE@
-VERSION=@VERSION@
 
 AFS_component_version_number.o: AFS_component_version_number.c
 
 AFS_component_version_number.c: @TOP_OBJDIR@/src/config/Makefile.version
-       echo 'char cml_version_number[]="@(#) OpenAFS ${VERSION} built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c
-       echo 'char* AFSVersion = "${PACKAGE} ${VERSION}"; ' >>AFS_component_version_number.c
+       VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@VERSION@"` && \
+       echo 'char cml_version_number[]="@(#) OpenAFS '$$VERSION' built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c && \
+       echo 'char* AFSVersion = "${PACKAGE} '$$VERSION'";' >>AFS_component_version_number.c
 
 version.xml:
-       echo '<?xml version="1.0" encoding="UTF-8"?>' >version.xml
-       echo '<revision>' >>version.xml
-       echo '<revnumber>${VERSION}</revnumber>' >>version.xml
+       VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@VERSION@"` && \
+       echo '<?xml version="1.0" encoding="UTF-8"?>' >version.xml && \
+       echo '<revision>' >>version.xml && \
+       echo '<revnumber>'$$VERSION'</revnumber>' >>version.xml && \
        echo '</revision>' >>version.xml
 
 version.txt: