From 52b81e5a60938a3e62d4e2f16eefa3582bc484a3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 28 Sep 2013 15:07:06 +0200 Subject: [PATCH] libpackage_build: Make sure built-in data dir path is absolute Fixes #10022. --- src/build/libpackage/Jamfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/build/libpackage/Jamfile b/src/build/libpackage/Jamfile index 6f9d80ea1e..f4ea926326 100644 --- a/src/build/libpackage/Jamfile +++ b/src/build/libpackage/Jamfile @@ -14,6 +14,12 @@ USES_BE_API on libpackage_build.so = true ; { # The package writer needs to know where the license files are located. local dataDir = [ FDirName $(HAIKU_TOP) data system data ] ; + # The directory path we compile in must be absolute. If it isn't prepend + # pwd. + local defines ; + if ! [ Match "(^/.*)" : $(dataDir) ] { + dataDir = `pwd`/$(dataDir) ; + } local defines = [ FDefines HAIKU_BUILD_SYSTEM_DATA_DIRECTORY="\\\"$(dataDir)\\\"" ] ;