Add make and gmake for use in tests.