mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-22 05:38:14 +00:00
Fix (hopefully) the git check
This commit is contained in:
parent
0f96e56963
commit
8951a8ebe0
1 changed files with 8 additions and 1 deletions
|
|
@ -5,6 +5,13 @@ GITDESCRIBE=`cd $(top_srcdir) && git describe --always`
|
|||
GIT_TAG=`cd $(top_srcdir) && git describe --abbrev=0`
|
||||
GITREVISION=`cd $(top_srcdir) && git rev-parse HEAD`
|
||||
|
||||
## This command is used to check if the sources are cloned in a git repo.
|
||||
## We can't only depend on the presence of the .git/ directory anymore,
|
||||
## because of gits submodule handling.
|
||||
## We now simply issue a git status and if there's an error, the $(GITSTATUS)
|
||||
## variable won't contain "GITOK"
|
||||
GITSTATUS=`cd $(top_srcdir) && git status > /dev/null && echo GITOK`
|
||||
|
||||
ECHO=/bin/echo
|
||||
|
||||
SUBDIRS=. help
|
||||
|
|
@ -161,7 +168,7 @@ AM_CXXFLAGS=$(AM_CFLAGS)
|
|||
#the PACKAGE_VERSION given in configure.ac
|
||||
|
||||
make_gitversion_h:
|
||||
if test -d $(top_srcdir)/.git ; then \
|
||||
if test "$(GITSTATUS)" == "GITOK" ; then \
|
||||
if test "$(GITDESCRIBE)" != "" ; then \
|
||||
if test "$(GIT_TAG)" != "$(PACKAGE_VERSION)" ; then \
|
||||
echo "*** PACKAGE_VERSION and git tag differ. Please put them identical."; \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue