Added (commented-out) defs for use with the build tree instead of the

installed version.