Fix 'make install' and -install-bundle