diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile.am | 9 | ||||
| -rw-r--r-- | main/version_info.cpp | 8 |
2 files changed, 6 insertions, 11 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index eadf84e1..888898f4 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -57,8 +57,7 @@ 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_COMMIT_DATE = `$(GIT) log --no-color -n 1 --pretty=format:%cd --date=short` @@ -72,11 +71,7 @@ BUILT_SOURCES = version-intermediate.h .PHONY: version-intermediate.h version-intermediate.h: $(AM_V_GEN)touch $@ - -$(AM_V_at)if [ -n "$(ENIGMA2_COMMIT_DATE)" ]; then \ - echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@; \ - elif [ -n "$(ENIGMA2_DATE)" ]; then \ - 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 a846c613..f639eb89 100644 --- 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; |