s3-waf: make the --with-Xdir options work more like in the classic build.