Fixup install rules

Merged Jørgen Lind requested to merge feature/jorgen/fixup_install_rules into master

Merge request reports