This commit rides the previous update, fixes some manual INSTALLATION_DIRS, and catches that list up with the package.