Remove hardcoding of directories, which are set in the included make file

Signed-off-by: Stefan Marr <git@stefan-marr.de>
Updated core-lib

Signed-off-by: Stefan Marr <git@stefan-marr.de>