From d377238f3a8ab1cf6275ae17cd915ac6f0a724b3 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 17 Nov 2010 21:43:48 +0100 Subject: .gitignore: add enigma2.sh --- tools/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 tools/.gitignore 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 -- cgit v1.2.3 From 616a5604e54055e71ee93209daa30bd4bfdbd849 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 22 Nov 2010 16:10:51 +0100 Subject: main/Makefile.am: add missing backslash --- main/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/Makefile.am b/main/Makefile.am index 78fcc6cd..e46eda2a 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 = \ -- cgit v1.2.3 From 001fef7e7ca9bad7745e374bad4e56f4a518a303 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 22 Nov 2010 16:17:29 +0100 Subject: main/Makefile.am: use --pretty instead of --format to support older Git versions --- main/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/Makefile.am b/main/Makefile.am index e46eda2a..0ad1ae9b 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -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 -- cgit v1.2.3