Log Message:
Rototill makefile without changing binary package.

Upstream does not have stable naming or location conventions;
sometimes files are in subdirectories, and sometimes not.  Sometimes
files even have spaces in their names.

To ease coping with this chaos, define more variables that can be
adjusted by the packager.  (Really, this commit is to capture partial
work before giving up for now on updating to 8.3.)