Fix running the tests with OBJDIR set

This commit is contained in:
Pierre Pronchery 2015-05-09 13:57:40 +02:00
parent f8740ea1ec
commit 2608e29b53
2 changed files with 2 additions and 3 deletions

View File

@ -4,4 +4,4 @@ dist=Makefile,tests.sh,binary/project.conf,binary/Makefile.Darwin,binary/Makefil
[tests.log] [tests.log]
type=script type=script
script=./tests.sh script=./tests.sh
depends=binary/project.conf,binary/Makefile.Darwin,binary/Makefile.NetBSD,binary/Makefile.Windows,library/project.conf,library/Makefile.Darwin,library/Makefile.Linux,library/Makefile.NetBSD,library/Makefile.Windows,object/project.conf,object/Makefile.NetBSD,plugin/Makefile.Darwin,plugin/Makefile.NetBSD,script/project.conf,script/Makefile.NetBSD,tests.sh depends=$(OBJDIR)../src/configure$(EXEEXT),binary/project.conf,binary/Makefile.Darwin,binary/Makefile.NetBSD,binary/Makefile.Windows,library/project.conf,library/Makefile.Darwin,library/Makefile.Linux,library/Makefile.NetBSD,library/Makefile.Windows,object/project.conf,object/Makefile.NetBSD,plugin/Makefile.Darwin,plugin/Makefile.NetBSD,script/project.conf,script/Makefile.NetBSD,tests.sh

View File

@ -27,8 +27,7 @@
#variables #variables
PROGNAME="tests.sh" PROGNAME="tests.sh"
#executables #executables
CONFIGURE="../src/configure" CONFIGURE="${OBJDIR}../src/configure"
[ -n "$OBJDIR" ] && CONFIGURE="${OBJDIR}configure"
DATE="date" DATE="date"
DIFF="diff" DIFF="diff"