X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2FMakefile.am;h=430b21538ddb354e7009464955a63a3fe331957d;hp=0ad1ae9b284fa14f7646909bdefc64c336524f07;hb=37eed24d02ba23acdd8e3b35c7ef04e6f108ba05;hpb=001fef7e7ca9bad7745e374bad4e56f4a518a303

diff --git a/main/Makefile.am b/main/Makefile.am
index 0ad1ae9..430b215 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -58,11 +58,14 @@ 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_BRANCH = `cat $(GIT_DIR)/branch`
 else
-ENIGMA2_DATE = `$(GIT) log --no-color -n 1 --pretty=format:%cd --date=short`
+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 --dirty --long --tags`
+ENIGMA2_REV = `$(GIT) describe --abbrev=7 --always --long --tags`
+endif
 endif
 
 BUILT_SOURCES = version-intermediate.h
@@ -70,11 +73,14 @@ BUILT_SOURCES = version-intermediate.h
 .PHONY: version-intermediate.h
 version-intermediate.h:
 	$(AM_V_GEN)touch $@
-	$(AM_V_at)[ -n "$(ENIGMA2_DATE)" ] && echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_DATE)\"" >> $@
-	$(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@
+	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_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
-endif
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
 	$(AM_V_CXXLD)$(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(enigma2_LDFLAGS) $(enigma2_OBJECTS) \