Move DIRS and related vars to configure.mk.org
Strip variables in configure.mk from build.mk
Eliminate CLEARENV