Restored path names that were changed by a previous "Configure" run.

(Rather than changing the files in places, we really should use .in files.)
Submitted by:
Reviewed by:
PR: