makefile fixes
devpi-server image support