Fix export problems in Makefile.
Merge branch 'flint-2.4' into trunk