Try and fix up resource file handling in the makefile to fix rename fallout.
Merge branch 'master' into my-mods