diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-12-20 12:55:16 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-12-20 12:55:16 +0100 |
| commit | 31a7ee4d64f718ac076f3d2037427877435c4101 (patch) | |
| tree | 14acf7d0d391c3a45bf045dc7ac8677a73e8a30f /main/Makefile.am | |
| parent | 37eed24d02ba23acdd8e3b35c7ef04e6f108ba05 (diff) | |
| parent | ef35eeebd55877fa9d1037a685f90b4027a0426e (diff) | |
| download | enigma2-31a7ee4d64f718ac076f3d2037427877435c4101.tar.gz enigma2-31a7ee4d64f718ac076f3d2037427877435c4101.zip | |
Merge branch 'obi/master' into experimental
Conflicts:
main/Makefile.am
Diffstat (limited to 'main/Makefile.am')
| -rw-r--r-- | main/Makefile.am | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index 430b2153..888898f4 100644 --- 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 |