Skip to contentSkip to conversation

Fix: make check in OOT build with absolute path

PATCH Mathieu Desnoyers 1 participant 1 message Sep 4, 2015 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Mathieu Desnoyers

author Applied
#1 lore raw

Merged, thanks!

Mathieu

Quoted 33 lines · ----- On Sep 4, 2015, at 5:31 PM, Michael Jeanson [email protected] wrote:

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.

---
tests/ust-elf/Makefile.am | 2 +-
tests/ust-elf/test_ust_elf.in | 2 +-

2 files changed, 2 insertions(+), 2 deletions(-)
tests/ust-elf/Makefile.am +0 -0
index 368e427..92337e7 100644
@@ -10,5 +10,5 @@ CLEANFILES = $(noinst_SCRIPTS)

EXTRA_DIST = test_ust_elf.in $(srcdir)/data/**

$(noinst_SCRIPTS): %: %.in

tests/ust-elf/Makefile.am +1 -1
-	sed "s#@TOPSRCDIR@#$(top_srcdir)#g" < $< > $@
+	sed "s#@ABSTOPSRCDIR@#$(abs_top_srcdir)#g" < $< > $@
	chmod +x $@
tests/ust-elf/test_ust_elf.in +1 -2
index 5cfbff6..03a995f 100755
@@ -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
--

1.9.1

Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com