[Libreoffice-commits] online.git: configure.ac Makefile.am

[Jan Holesovsky]

 Makefile.am  |    3 +++
 configure.ac |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 848145503bf7b98ce4a4aa0a858a0d71dd0dbb26
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Apr 28 11:54:18 2017 +0200

    Distribute the git hash for easier identification.
    
    Change-Id: I57084231d0878de15b4b0478122f49e94af563bf

diff --git a/Makefile.am b/Makefile.am
index c72ad4d0..cfcfd7c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,6 +187,9 @@ noinst_HEADERS = $(wsd_headers) $(shared_headers) $(kit_headers) \
                  test/countloolkits.hpp \
                  test/helpers.hpp
 
+dist-hook:
+	git log -1 --format=%h > $(distdir)/dist_git_hash 2> /dev/null || rm $(distdir)/dist_git_hash
+
 EXTRA_DIST = discovery.xml \
              favicon.ico \
              loolkitconfig.xcu \
diff --git a/configure.ac b/configure.ac
index ad4b6757..3f5daff2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_DEFINE_UNQUOTED([LOOLWSD_VERSION],[["$LOOLWSD_VERSION"]],[LibreOffice Online
 
 # try to add a git hash for a version if we're developing
 LOOLWSD_VERSION_HASH="$LOOLWSD_VERSION"
-git_hash=`cd ${srcdir} && git log -1 --format=%h 2> /dev/null`
+git_hash=`cd ${srcdir} && ( cat dist_git_hash 2> /dev/null || git log -1 --format=%h 2> /dev/null )`
 if test "z$git_hash" != "z"; then
    LOOLWSD_VERSION_HASH=$git_hash
 fi