Update Makefile to match current 2.6.x demos