Cleanup

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

diff --git a/deal.II/GNUmakefile b/deal.II/GNUmakefile
index dd73202ea11b70c51b404daf91181d53e461b4cb..138b419ff2fd4331d2cf824b757bfd936877fc30 100644 (file)
--- a/deal.II/GNUmakefile
+++ b/deal.II/GNUmakefile
@@ -64,17 +64,14 @@ cmake:
 #
 TMPDIR=/tmp
 CMAKE=cmake
+SVN=svn info .
 date:= $(shell date +%s)
 random:=$(shell echo "$$RANDOM")
 testdir:= "$(TMPDIR)"/deal-build-test.$(date)-$(random)
 builddir:= $(testdir)/build
 installdir:= $(testdir)/install
 LOGDIR=$(testdir)
-ifeq "$(CONFIGFILE)" ""
-  logfile:=$(LOGDIR)/$(date).automatic.log
-else
-  logfile:=$(LOGDIR)/$(date).$(shell basename "$(CONFIGFILE)").log
-endif
+logfile:=$(LOGDIR)/$(date).$(firstword $(notdir $(CONFIGFILE)) automatic).log
 
 .PHONY: build_test
 build_test:
@@ -83,7 +80,7 @@ build_test:
        mkdir -p $(LOGDIR)
        @echo "AUTOMATED DEAL.II BUILD TEST" | tee $(logfile)
        @echo "BEGIN HEADER `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile)
-       @svn info . | perl -ne 'print "dealii-feature: revision=$$_" if s/Last Changed Rev: //; print "dealii-feature: branch=$$1\n" if m/svn\.dealii\.org\/(.+)\/deal.II/;' | tee -a $(logfile)
+       @$(SVN) | perl -ne 'print "dealii-feature: revision=$$_" if s/Last Changed Rev: //; print "dealii-feature: branch=$$1\n" if m/svn\.dealii\.org\/(.+)\/deal.II/;' | tee -a $(logfile)
        @echo "dealii-feature: user=$(USER)"
        @echo "dealii-feature: host=`hostname`"
        @echo "dealii-feature: configuration=`basename \"$(CONFIGFILE)\"`"