Updated bench Makefile for improved support of external complibs
Updated new path for internal complib sources
Fixed bad string concatenation in cmake