elkscmd: Makefile fixes
Various build fixes