Merge branch 'trunk' into branch_cmake

git-svn-id: https://svn.dealii.org/branches/branch_cmake@29086 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/contrib/utilities/build_test b/deal.II/contrib/utilities/build_test
index b1c5e25697c5bef587ff06ef816fc73306e8e9f1..954d24144191d408ec5c3c79244b1f88cace4408 100755 (executable)
--- a/deal.II/contrib/utilities/build_test
+++ b/deal.II/contrib/utilities/build_test
@@ -29,10 +29,10 @@ SOURCEDIR=$(CURDIR)
 LOGDIR=$(PWD)
 TMPDIR=/tmp
 CMAKE=cmake
-SVN=svn info
+SVN=svn info $(SOURCEDIR)
 
-branch:=$(shell $(SVN) $(SOURCEDIR) | perl -ne 'print "$$1" if m/svn\.dealii\.org\/(.+)\/deal.II/;')
-revision:=$(shell $(SVN) $(SOURCEDIR) | perl -ne 'print "$$_" if s/Last Changed Rev: //;')
+branch:=$(shell $(SVN) | perl -ne 'print "$$1" if m/svn\.dealii\.org.*\/(.+?)\/deal.II/;')
+revision:=$(shell $(SVN) | perl -ne 'print "$$_" if s/Last Changed Rev: //;')
 
 date:= $(shell date +%s)
 random:=$(shell echo "$$RANDOM")