xenocara broken because of the recent make change?

This is my make build after make bootstrap and make obj.
It wasn't clear to me where the make distclean should be run.

This is an i386-current system with openbsd proper compiled
(and cvs update) on Feb 7.

--STeve Andre'


vista /usr/xenocara make build
make distrib-dirs
mtree -qdef /etc/mtree/BSD.x11.dist -p / -U
cd /usr/xenocara/share/mk  && exec  make X11BASE=/usr/X11R6 install
install -c -o root -g bin -m 444 automake.dep bsd.xconf.mk 
bsd.xorg.mk  /usr/X11R6/share/mk
cd /usr/xenocara/util/macros  && make -f Makefile.bsd-wrapper  && exec  
make -f Makefile.bsd-wrapper install
PKG_CONFIG_LIBDIR="/usr/X11R6/lib/pkgconfig"  
CONFIG_SITE=/usr/xenocara/etc/config.site  CFLAGS="-O2 -pipe"  MAKE="make" 
exec 
sh /usr/xenocara/util/macros/configure --prefix=/usr/X11R6  --sysconfdir=/etc  --mandir=/usr/X11R6/man  --cache-file=/usr/xobj/xorg-config.cache.i386
configure: loading site script /usr/xenocara/etc/config.site
configure: loading cache /usr/xobj/xorg-config.cache.i386
checking for a BSD-compatible install... (cached) /usr/bin/install -c
checking for gawk... (cached) nawk
checking whether make sets $(MAKE)... (cached) yes
configure: error: source directory already configured; run "make distclean" 
there first
*** Error code 1

Stop in /usr/xenocara/util/macros (line 166 
of /usr/X11R6/share/mk/bsd.xorg.mk).
*** Error code 1

Stop in /usr/xenocara (line 38 of Makefile).