From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 4 Sep 2015 21:31:31 +0000 (-0400)
Subject: Fix: make check in OOT build with absolute path
X-Git-Tag: v2.8.0-rc1~82
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d8c9fa4381b591e3d4d6c33280a1b104fabd279d;p=lttng-ust.git

Fix: make check in OOT build with absolute path

The previous patch fixed the out of tree build when the configure script
was called with a path relative to the builddir but still failed when
the path was absolute. This works with both.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/tests/ust-elf/Makefile.am b/tests/ust-elf/Makefile.am
index 368e427e..92337e76 100644
--- a/tests/ust-elf/Makefile.am
+++ b/tests/ust-elf/Makefile.am
@@ -10,5 +10,5 @@ CLEANFILES = $(noinst_SCRIPTS)
 EXTRA_DIST = test_ust_elf.in $(srcdir)/data/**
 
 $(noinst_SCRIPTS): %: %.in
-	sed "s#@TOPSRCDIR@#$(top_srcdir)#g" < $< > $@
+	sed "s#@ABSTOPSRCDIR@#$(abs_top_srcdir)#g" < $< > $@
 	chmod +x $@
diff --git a/tests/ust-elf/test_ust_elf.in b/tests/ust-elf/test_ust_elf.in
index 5cfbff69..03a995fc 100755
--- a/tests/ust-elf/test_ust_elf.in
+++ b/tests/ust-elf/test_ust_elf.in
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 TEST_DIR=$(dirname $0)
-./${TEST_DIR}/prog $TEST_DIR/@TOPSRCDIR@/tests/ust-elf
+./${TEST_DIR}/prog @ABSTOPSRCDIR@/tests/ust-elf