Remove `make package' option and fix build