Improve that makefile to make installation working on existing environment