Small Makefile changes for PJproject support
Tidying up before upstream merge