update Makefile to relative directory
Merge branch 'feature-etc' into develop