Avoid redefing MAKEFILES
Adapt to MAKEFILES_DIR