From 8a93130b066efd90f5b7d775cb1b5812e7677863 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 7 Feb 2014 08:50:39 +0100
Subject: repair versioning and tarball generation

---
 src/utils.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/utils.cpp')

diff --git a/src/utils.cpp b/src/utils.cpp
index b7e1400..05a2d87 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -47,8 +47,14 @@ time_t getDabTime()
 void header_message() 
 {
     etiLog.log(info,
-            "Welcome to %s %s%s, compiled at %s, %s\n\n",
-            PACKAGE_NAME, PACKAGE_VERSION, GITVERSION, __DATE__, __TIME__);
+            "Welcome to %s %s, compiled at %s, %s\n\n",
+            PACKAGE_NAME,
+#if defined(GITVERSION)
+            GITVERSION,
+#else
+            PACKAGE_VERSION,
+#endif
+            __DATE__, __TIME__);
     etiLog.log(info,
             "Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012\n"
             "Her Majesty the Queen in Right of Canada,\n"
-- 
cgit v1.2.3