CPMD; Fixed two problems with build script.
CPMD; Fixed two problems with build script.

UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts