update to makefile to be more flexible
(thanks frans!)