Commit 81e4ad0e authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'autotool-fixes' into 'master'

Get basename of branch without --short option, this requires a git > 1.7.10

Don't use --short in symbolic-ref. 

See merge request !45
parents fc72d3b3 9d79e2ec
......@@ -63,7 +63,7 @@ libswiftsim_mpi_la_SHORTNAME = mpi
version.h: version.h.in $(AM_SOURCES) $(include_HEADERS) $(noinst_HEADERS)
if test "X$(GIT_CMD)" != "X"; then \
GIT_REVISION=`$(GIT_CMD) describe --abbrev=8 --always --tags --dirty`; \
GIT_BRANCH=`$(GIT_CMD) symbolic-ref --short HEAD`; \
GIT_BRANCH=`$(GIT_CMD) symbolic-ref HEAD| sed 's,.*/,,'`; \
sed -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \
-e "s,@GIT_REVISION\@,$${GIT_REVISION}," \
-e "s,@GIT_BRANCH\@,$${GIT_BRANCH}," version.h.in > version.h; \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment