Make.defines now better handles directories. Typo on cppunit lib name.