Rework the file versioning. Use template files which are passed through sed to create the versioned files. On 'make clean', remove versioned files. This should ensure that 'make release' or 'make CREATE_SNAPSHOT=yes release' produces internally consistent results.
Matthew Seaman