Move fpath
Fix makefile