revert BASEETCDIR/BASEBINDIR to BASEDIR