fixed bug in profile configuration in makefiles.
Merge branch '7.x-1.x' into eliminate_warnings_during_installation