More tweaks to build to ensure that all /usr/local/oracc is done via .in files
More fixes to .in files