more nonsrcdir build fixes

Original commit message from CVS:
more nonsrcdir build fixes
1 file changed