diff --git a/substitute.mk b/substitute.mk index ede3470073..96fc16bf5b 100644 --- a/substitute.mk +++ b/substitute.mk @@ -1,5 +1,7 @@ %: %.in Makefile sed \ + -e "s^@abs_top_srcdir\@^$(abs_top_srcdir)^g" \ + -e "s^@abs_top_builddir\@^$(abs_top_builddir)^g" \ -e "s^@extra1\@^$(extra1)^g" \ -e "s^@prefix\@^$(prefix)^g" \ -e "s^@bindir\@^$(bindir)^g" \ diff --git a/tests/common.sh.in b/tests/common.sh.in index 7504dc059e..5619580a72 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -1,5 +1,8 @@ set -e +export top_srcdir="@abs_top_srcdir@" +export top_builddir="@abs_top_builddir@" + export TOP=$(pwd)/.. export TEST_ROOT=$(pwd)/test-tmp diff --git a/tests/init.sh b/tests/init.sh index 9ce7985d70..4296f43b61 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -47,7 +47,9 @@ EOF cat > $NIX_BIN_DIR/nix/substituters/download-using-manifests.pl <