Simplified the Makefile.
Incorporated changes from Olivier's pariemacs-3.10.