Fix for when TOOLKIT_ROOTs are not set...
Remove debug print
Even simpler fix
Merge branch 'makefiles' into path_fixes