fix a Makefile
Merge branch 'master' of github.com:Macaulay2/M2

Conflicts:
	M2/libraries/pari/Makefile.in
update change-log