Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
ab60172d
Commit
ab60172d
authored
Oct 16, 2015
by
Angus Lepper
Browse files
Ensure GIT_BRANCH non-empty when not on a branch
parent
1a8b0e63
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/Makefile.am
View file @
ab60172d
...
...
@@ -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 HEAD|
sed
's,.*/,,
'
`
;
\
GIT_BRANCH
=
`
$(GIT_CMD)
branch |
sed
-n
's/^\* \(.*\)/\1/p
'
`
;
\
sed
-e
"s,@PACKAGE_VERSION
\@
,
$(PACKAGE_VERSION)
,"
\
-e
"s,@GIT_REVISION
\@
,
$
${GIT_REVISION}
,"
\
-e
"s,@GIT_BRANCH
\@
,
$
${GIT_BRANCH}
,"
version.h.in
>
version.h
;
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment