Merge branch 'obi/master' into experimental

Conflicts:
	main/Makefile.am

diff --git a/main/Makefile.am b/main/Makefile.am
index 430b215..888898f 100644 (file)
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -57,11 +57,9 @@ GIT_DIR = $(top_srcdir)/.git
 GIT = git --git-dir=$(GIT_DIR)
 
 if HAVE_FAKE_GIT_DIR
-ENIGMA2_DATE = `cat $(GIT_DIR)/last_commit_info | grep 'Date:' | cut -d' ' -f4`
-ENIGMA2_COMMIT_DATE = `cat $(GIT_DIR)/last_commit_info | grep 'CommitDate:' | cut -d' ' -f2`
+ENIGMA2_COMMIT_DATE = `grep '^CommitDate:' $(GIT_DIR)/last_commit_info | cut -d' ' -f2`
 ENIGMA2_BRANCH = `cat $(GIT_DIR)/branch`
 else
-ENIGMA2_DATE =
 ENIGMA2_COMMIT_DATE = `$(GIT) log --no-color -n 1 --pretty=format:%cd --date=short`
 ENIGMA2_BRANCH = `$(GIT) branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
 ENIGMA2_REV = `$(GIT) describe --abbrev=7 --always --long --tags`
@@ -73,11 +71,7 @@ BUILT_SOURCES = version-intermediate.h
 .PHONY: version-intermediate.h
 version-intermediate.h:
        $(AM_V_GEN)touch $@
-       if [ -n "$(ENIGMA2_COMMIT_DATE)" ]; then \
-               $(AM_V_at)[ -n "$(ENIGMA2_COMMIT_DATE)" ] && echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@; \
-       else \
-               $(AM_V_at)[ -n "$(ENIGMA2_DATE)" ] && echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_DATE)\"" >> $@; \
-       fi;
+       -$(AM_V_at)[ -n "$(ENIGMA2_COMMIT_DATE)" ] && echo "#define ENIGMA2_COMMIT_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@; \
        -$(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@
        -$(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@
        $(AM_V_at)([ -f version.h ] && diff -q version.h $@ >/dev/null) || $(INSTALL_HEADER) $@ version.h

diff --git a/main/version_info.cpp b/main/version_info.cpp
index a846c61..f639eb8 100644 (file)
--- a/main/version_info.cpp
+++ b/main/version_info.cpp
@@ -1,13 +1,13 @@
 #include "version_info.h"
 #include "version.h"
 
-#ifndef ENIGMA2_LAST_CHANGE_DATE
-#define ENIGMA2_LAST_CHANGE_DATE __DATE__
+#ifndef ENIGMA2_COMMIT_DATE
+#define ENIGMA2_COMMIT_DATE __DATE__
 #endif
-const char *enigma2_date = ENIGMA2_LAST_CHANGE_DATE;
+const char *enigma2_date = ENIGMA2_COMMIT_DATE;
 
 #ifndef ENIGMA2_BRANCH
-#define ENIGMA2_BRANCH "HEAD"
+#define ENIGMA2_BRANCH "(no branch)"
 #endif
 const char *enigma2_branch = ENIGMA2_BRANCH;