installation: fixes broken Makefiles

Recent changes broke make install, here are the fixes.