Modifications so that "make dist" will gather all necessary files