* commit 'a159b587':
  fix missing "/" in path
  add support for cache directory make configs use specific directory variables instead of just base_dir so that one configuration can be used for fhs and legacy installations