BUILD_DIR -> BUILDDIR, for consistency.
12 files changed