Makefile: don't use package-initialize

See #1653.
Merge branch 'n/find-dash' into next