Simple build fixes

Next try, should work with makefile and build directory in arbitrary, different locations.