Changes JB made to eliminate some errors when sourcing Makefile. Some er...

...rors remain.

May make more sense once I give you my other comments.