Merge pull request #486 from libexpat/issue-485-fix-autotools-cmake-files

Fix CMake files installed by GNU Autotools build system (fixes #485)