diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-11-22 16:19:23 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-22 16:19:23 +0100 |
| commit | 2ddea3d034f830c0809687b89cef2489e92a3a3d (patch) | |
| tree | 1cefd4efbaaf04fbad41aab98bda9b89e0862ee6 | |
| parent | e7e373740021d60b23319ecee1e1c456d2d7f67d (diff) | |
| parent | 001fef7e7ca9bad7745e374bad4e56f4a518a303 (diff) | |
| download | enigma2-2ddea3d034f830c0809687b89cef2489e92a3a3d.tar.gz enigma2-2ddea3d034f830c0809687b89cef2489e92a3a3d.zip | |
Merge branch 'obi/master' into experimental
| -rw-r--r-- | main/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/.gitignore | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index 78fcc6cd..0ad1ae9b 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -16,7 +16,7 @@ enigma2_SOURCES = \ xmlgenerator.cpp \ xmlgenerator.h \ version_info.cpp \ - version_info.h + version_info.h \ version.h EXTRA_DIST = \ @@ -60,7 +60,7 @@ if HAVE_FAKE_GIT_DIR ENIGMA2_DATE = `cat $(GIT_DIR)/last_commit_info | grep 'Date:' | cut -d' ' -f4` ENIGMA2_BRANCH = `cat $(GIT_DIR)/branch` else -ENIGMA2_DATE = `$(GIT) log --no-color -n 1 --format=format:%cd --date=short` +ENIGMA2_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` endif diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 00000000..fcadf306 --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1 @@ +enigma2.sh |