Log Message:
Sort variables depending on ${EMACS_FLAVOR} (emacs or xemacs).  Prefer
assignment to conditional.  Include mk/emacs.mk lazily.

No functional changes intended.