Fix: builtin script referring to old directories

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I30fb8abb1a69d6695552947e30cf2b43d3db36b3

diff --git a/scripts/built-in.sh b/scripts/built-in.sh
index d9720230e6a9e69de5e73bc90c5accbcb726952d..f0594eccdba217157bd016a2e75ad84805243333 100755 (executable)
--- a/scripts/built-in.sh
+++ b/scripts/built-in.sh
@@ -15,7 +15,7 @@ KERNEL_DIR="$(readlink --canonicalize-existing "$1")"
 ln -sf "$(pwd)" "${KERNEL_DIR}/lttng"
 
 # Graft ourself to the kernel build system
-echo 'source "lttng/Kconfig"' >> "${KERNEL_DIR}/Kconfig"
+echo 'source "lttng/src/Kconfig"' >> "${KERNEL_DIR}/Kconfig"
 sed -i 's#+= kernel/#+= kernel/ lttng/#' "${KERNEL_DIR}/Makefile"
 
 echo >&2

diff --git a/src/Kconfig b/src/Kconfig
index 85946faff8be4f0c1045a159856e6378abe2daa8..b7f670e622545b269480c16e7b382878f66e2f0e 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -13,4 +13,4 @@ config LTTNG
 
          If unsure, say N.
 
-source "lttng/tests/Kconfig"
+source "lttng/src/tests/Kconfig"