Fixed the build system to work correctly with packages.