From 512aaa1afcda56dce28c7a0164f4be85306aedda Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Mon, 4 Nov 2019 20:09:54 +0100 Subject: [PATCH] Fix paths for out-of-tree builds, found by make distcheck Signed-off-by: Joachim Nilsson --- test/Makefile.am | 4 ++-- test/api.sh | 2 +- test/local.sh | 2 +- test/remote.sh | 2 +- test/start.sh | 2 +- test/stop.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 5cf77a6..805f984 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -5,9 +5,9 @@ TEST_EXTENSIONS = .sh check_PROGRAMS = api api_SOURCES = api.c -api_CFLAGS = -I../src +api_CFLAGS = -I$(srcdir)/../src api_LDFLAGS = -static -api_LDADD = -L../src ../src/libsyslog.la +api_LDADD = ../src/libsyslog.la TESTS = start.sh TESTS += local.sh diff --git a/test/api.sh b/test/api.sh index 7f2db1f..cac47e7 100755 --- a/test/api.sh +++ b/test/api.sh @@ -1,6 +1,6 @@ #!/bin/sh set -e -. ./test.rc +. ${srcdir}/test.rc export MSG="no-openlog-apitest" diff --git a/test/local.sh b/test/local.sh index 196b60b..dea1e2b 100755 --- a/test/local.sh +++ b/test/local.sh @@ -1,5 +1,5 @@ #!/bin/sh -. ./test.rc +. ${srcdir}/test.rc MSG="foobar" diff --git a/test/remote.sh b/test/remote.sh index d2b4bea..2b8f78a 100755 --- a/test/remote.sh +++ b/test/remote.sh @@ -1,6 +1,6 @@ #!/bin/sh set -ex -. ./test.rc +. ${srcdir}/test.rc MSG="kilroy" diff --git a/test/start.sh b/test/start.sh index 3600604..dee0a61 100755 --- a/test/start.sh +++ b/test/start.sh @@ -1,5 +1,5 @@ #!/bin/sh -. ./test.rc +. ${srcdir}/test.rc if [ x"${srcdir}" = x ]; then srcdir=. diff --git a/test/stop.sh b/test/stop.sh index fb24863..e26e3a8 100755 --- a/test/stop.sh +++ b/test/stop.sh @@ -1,5 +1,5 @@ #!/bin/sh -. ./test.rc +. ${srcdir}/test.rc if [ -e ${PID} ]; then echo "Killing `cat ${PID}` ..."