Makefile: extra precaution when building to avoid 0.6.0 build problem