Bugfix: Fixed MakeFile issues with paths containing spaces.

(cherry picked from commit dbab8817c0208e705ef2ae02876ac640ed2dce55)

Conflicts:
	Makefile