diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-12-20 12:18:19 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-12-20 12:18:19 +0100 |
| commit | 16c07b98245e94a162685803acd4ba4b5d4298a3 (patch) | |
| tree | e44802522d3c141ccc98e52a80016b862f60cf55 /main | |
| parent | 0fff842a5f2b4185257aadb6b6a3dfa033a91d72 (diff) | |
| parent | 0cbccde1b0264df7a0a5f8723b8de881f0d5f927 (diff) | |
| download | enigma2-16c07b98245e94a162685803acd4ba4b5d4298a3.tar.gz enigma2-16c07b98245e94a162685803acd4ba4b5d4298a3.zip | |
Merge branch 'master' into obi/master
Conflicts:
main/Makefile.am
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index c4513e91..eadf84e1 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -58,9 +58,10 @@ 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_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` endif @@ -71,7 +72,11 @@ 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)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_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 |