Merge "display: makefile fixes"