Add some $s to rules/build-package.mk for consistency