fixed the build script after merging Daniel's stuff and updated upstream
2 files changed