directory versioning
INSTALLDIR_INCLUDE_PREFIX -> INSTALLDIR_PREFIX
Merge branch 'install-paths' into cmake-config
Fixes from upstream path changes.
Further refine cmake script, now support versioned include.