Merge branch 'makefile-fixes' into 'master'

Makefile fixes

See merge request !2
7 jobs for master in 44 minutes and 29 seconds (queued for 2 minutes and 18 seconds)
latest
Status Name Job ID Coverage
  Test
passed debianOldOldStable #79506

00:14:16

passed debianOldStable #79505

00:15:38

passed debianStable #79503

00:12:20

passed debianTesting #79504

00:14:12

passed thesisPDF #79500

00:00:48

passed ubuntuLatest #79501

00:18:28

passed ubuntuRolling #79502

00:19:10