Correct the calculation of the package directory
Merge branch 'develop' into feature/makefile-monograph