[mesos] branch master updated: Fixed build specific artefact generation.

[tillt]

This is an automated email from the ASF dual-hosted git repository.

tillt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new 16dd674  Fixed build specific artefact generation.
16dd674 is described below

commit 16dd67469f93fee95642e7cad00bdf128aa6da49
Author: Till Toenshoff <toensh...@me.com>
AuthorDate: Thu Mar 7 01:29:59 2019 +0100

    Fixed build specific artefact generation.
---
 configure.ac    | 8 ++++----
 src/Makefile.am | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1f45d5c..5302e66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2829,7 +2829,7 @@ git_config=src/common/git_version.hpp
 
 AC_MSG_CHECKING([${git_config} presence])
 
-AS_IF([test -f ${git_config}], [AC_MSG_RESULT([yes])], [
+AS_IF([test -f ${srcdir}/${git_config} || test -f ${git_config}], 
[AC_MSG_RESULT([yes])], [
   AC_MSG_RESULT([no])
 
   AC_MSG_NOTICE([generating ${git_config}])
@@ -2841,7 +2841,7 @@ AS_IF([test -f ${git_config}], [AC_MSG_RESULT([yes])], [
     # Optionally set BUILD_GIT_SHA.
     DEFINE_BUILD_GIT_SHA=""
 
-    git_sha="$(git --git-dir=\"${git_dir}\" rev-parse HEAD 2>/dev/null)"
+    git_sha=$(git --git-dir=${git_dir} rev-parse HEAD 2>/dev/null)
 
     AS_IF([test $? = 0], [
       DEFINE_BUILD_GIT_SHA="#define BUILD_GIT_SHA \"${git_sha}\""
@@ -2851,7 +2851,7 @@ AS_IF([test -f ${git_config}], [AC_MSG_RESULT([yes])], [
     # Optionally set BUILD_GIT_BRANCH.
     DEFINE_BUILD_GIT_BRANCH=""
 
-    git_branch="$(git --git-dir=\"${git_dir}\" symbolic-ref HEAD 2>/dev/null)"
+    git_branch=$(git --git-dir=${git_dir} symbolic-ref HEAD 2>/dev/null)
 
     AS_IF([test $? = 0], [
       DEFINE_BUILD_GIT_BRANCH="#define BUILD_GIT_BRANCH \"${git_branch}\""
@@ -2861,7 +2861,7 @@ AS_IF([test -f ${git_config}], [AC_MSG_RESULT([yes])], [
     # Optionally set BUILD_GIT_TAG.
     DEFINE_BUILD_GIT_TAG=""
 
-    git_tag="$(git --git-dir=\"${git_dir}\" describe --exact --tags 
2>/dev/null)"
+    git_tag=$(git --git-dir=${git_dir} describe --exact --tags 2>/dev/null)
 
     AS_IF([test $? = 0], [
       DEFINE_BUILD_GIT_TAG="#define BUILD_GIT_TAG \"${git_tag}\""
diff --git a/src/Makefile.am b/src/Makefile.am
index d451d7c..aa9fd73 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1540,6 +1540,8 @@ BUILD_FLAGS = $(echo $(MESOS_CPPFLAGS) $(CPPFLAGS) | 
$(SED) 's/\"/\\\"/g')        \
               $(echo $(AM_CFLAGS) $(CFLAGS) | $(SED) 's/\"/\\\"/g')            
\
               $(echo $(AM_CXXFLAGS) $(CXXFLAGS) | $(SED) 's/\"/\\\"/g')
 
+EXTRA_DIST += common/git_version.hpp.in
+
 # TODO(benh): Provide other build flags.
 
 libbuild_la_CPPFLAGS += -DBUILD_FLAGS="\"$$BUILD_FLAGS\""