Adapted build process to use the new file to support all version of the library (upgrading to 6.0 breaks everything). Former-commit-id: 820ad02968
820ad02968
PBerger