From 47989619cd206ed8075265e27a799320ecefa118 Mon Sep 17 00:00:00 2001
From: "ardi@ist-einmalig.de" <ardi@ist-einmalig.de>
Date: Sun, 26 Jul 2009 11:32:30 +0000
Subject: [PATCH] little changes

---
 Makefile  |  4 ++--
 svnrev.sh | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 9ec65392..418cdba1 100644
--- a/Makefile
+++ b/Makefile
@@ -54,8 +54,9 @@ export DEPSDIR	:=	$(CURDIR)/$(BUILD)
 #---------------------------------------------------------------------------------
 # automatically build a list of object files for our project
 #---------------------------------------------------------------------------------
+SVNREV		:=	$(shell svnrev.sh)
 export CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-export CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+export CPPFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
 sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
 SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
 BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
@@ -123,7 +124,6 @@ release:
 else
 
 DEPENDS	:=	$(OFILES:.o=.d)
-SVNREV	:=	$(shell ../svnrev.sh)
 
 #---------------------------------------------------------------------------------
 # main targets
diff --git a/svnrev.sh b/svnrev.sh
index 8d0b0142..ad79f2f4 100644
--- a/svnrev.sh
+++ b/svnrev.sh
@@ -1,20 +1,20 @@
 #! /bin/sh
 #
-a=$(svnversion -n ..)
-[ -n "$a" ] || a=$(SubWCRev .. | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
+a=$(svnversion -n .)
+[ -n "$a" ] || a=$(SubWCRev . | tr -d '\n' | sed 's/[^0-9]*[0-9]*[^0-9]*\([0-9]*\).*/\1/')
 
-[ -f ../source/svnrev.c ] || touch ../source/svnrev.c
+[ -f ./source/svnrev.c ] || touch ./source/svnrev.c
 
-b=$(cat ../source/svnrev.c | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
+b=$(cat ./source/svnrev.c | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
 
 if [ "$a" != "$b" ]; then
-	echo '#define SVN_REV "'$a'"' > ../source/svnrev.c
-	echo '' >> ../source/svnrev.c
-	echo 'const char *GetRev()' >> ../source/svnrev.c
-	echo '{ ' >> ../source/svnrev.c
-	echo '  return SVN_REV;' >> ../source/svnrev.c
-	echo '}' >> ../source/svnrev.c
-	echo '' >> ../source/svnrev.c
+	echo '#define SVN_REV "'$a'"' > ./source/svnrev.c
+	echo '' >> ./source/svnrev.c
+	echo 'const char *GetRev()' >> ./source/svnrev.c
+	echo '{ ' >> ./source/svnrev.c
+	echo '  return SVN_REV;' >> ./source/svnrev.c
+	echo '}' >> ./source/svnrev.c
+	echo '' >> ./source/svnrev.c
 	echo 'svnrev changed' >&2
 fi
 echo $a