Fix Makefiles to work in/out of Travis CI