Updated makefiles to remove dependencies on OCCA_DIR