Proper configuration options, and cleanup
Makefile: compatibility fix

with different versions of ocp-build
Fixed indent of ending/unclosed comments