Issue #6580 - Unify directory definitions to one section of Makefile (casper)