From: Felix Domke <felix.domke@multimedia-labs.de>
Date: Sun, 9 Aug 2009 15:56:31 +0000 (+0200)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Tag: 2.6.0~156
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/741c61837972ba31ee12a68214cc271c5d8b5b70?hp=b68433e2a86955a8a1bf5fa98fcb77110ed805bd

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

diff --git a/main/Makefile.am b/main/Makefile.am
index 891b646a..da09c1a2 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -23,6 +23,7 @@ version.h: # ../CVS/Entries ../CVS/Root
 	> version.h
 	if [ -f ../CVS/Tag ]; then echo "#define ENIGMA2_CHECKOUT_TAG \"`cat ../CVS/Tag`\"" >> version.h; fi
 	if [ -f ../CVS/Root ]; then echo "#define ENIGMA2_CHECKOUT_ROOT \"`cat ../CVS/Root`\"" >> version.h; fi
+	if [ -d .svn ]; then echo "#define ENIGMA2_CHECKOUT_TAG \"D`svn info | grep 'Last Changed Date:' | sed -e 's/[^:]*: \(....\)-\(..\)-\(..\) \(..\):\(..\):\(..\).*+.*$$/\1.\2.\3.\4.\5.\6/'`\"" >> version.h; fi
 
 enigma2_LDADD_WHOLE = \
 	$(top_builddir)/lib/actions/libenigma_actions.a \