More changes to Makefile and spec. Getting closer to something that works.