From 00da9d91643cb3a6756b907dd454321b0a74fda5 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 11 Nov 2014 21:19:44 +0100 Subject: [PATCH] Fixed building with OBJDIR --- tests/Makefile | 2 +- tests/project.conf | 2 +- tests/tests.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 76b3a9f..39abbae 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -10,7 +10,7 @@ INSTALL = install all: $(TARGETS) -$(OBJDIR)tests.log: ../src/configure library/project.conf library/Makefile.Darwin library/Makefile.NetBSD plugin/Makefile.Darwin plugin/Makefile.NetBSD tests.sh +$(OBJDIR)tests.log: library/project.conf library/Makefile.Darwin library/Makefile.NetBSD plugin/Makefile.Darwin plugin/Makefile.NetBSD tests.sh ./tests.sh -P "$(PREFIX)" -- "$(OBJDIR)tests.log" clean: diff --git a/tests/project.conf b/tests/project.conf index 54b8e14..36951c3 100644 --- a/tests/project.conf +++ b/tests/project.conf @@ -4,4 +4,4 @@ dist=Makefile,tests.sh,library/project.conf,library/Makefile.Darwin,library/Make [tests.log] type=script script=./tests.sh -depends=../src/configure,library/project.conf,library/Makefile.Darwin,library/Makefile.NetBSD,plugin/Makefile.Darwin,plugin/Makefile.NetBSD,tests.sh +depends=library/project.conf,library/Makefile.Darwin,library/Makefile.NetBSD,plugin/Makefile.Darwin,plugin/Makefile.NetBSD,tests.sh diff --git a/tests/tests.sh b/tests/tests.sh index d22efe7..d0e4f6f 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -27,6 +27,7 @@ #variables #executables CONFIGURE="../src/configure" +[ -n "$OBJDIR" ] && configure="${OBJDIR}configure" DATE="date" DIFF="diff"