XENOCARA_TOP -> XSRCDIR and now defaults to /usr/src/xenocara

XENOCARA_OBJDIR -> XOBJDIR  and now defaults to /usr/xobj
suggested by espie@ ok krw@ mbalmer@

Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2007/03/28 19:41:15 matthieu Exp $
+# $OpenBSD: Makefile,v 1.20 2007/03/31 20:25:53 matthieu Exp $
 .include <bsd.own.mk>
 
 LOCALAPPD=/usr/local/lib/X11/app-defaults
 LOCALAPPX=/usr/local/lib/X11
 REALAPPD=/etc/X11/app-defaults
-XCONFIG=${XENOCARA_TOP}/etc/X11.${MACHINE}/xorg.conf
+XCONFIG=${XSRCDIR}/etc/X11.${MACHINE}/xorg.conf
 RM?=rm
 
 SUBDIR= proto data/bitmaps lib app data/xkbdata xserver driver util doc

README

@@ -79,6 +79,10 @@ GNU autotools packages installed:
     - metaauto 0.6 (or later) (devel/metaauto)
     - libtool 1.5.22 (or later) (devel/libtool)
 
+  Path
+
+To build Xenocara, you need to have /usr/X11R6/bin in your PATH. 
+
   Sudo
 
 If the SUDO variable points to your sudo(8) binary in /etc/mk.conf,
@@ -90,12 +94,18 @@ If you have installed the full Xenocara X sets on your system, you
 don't need to build all of Xenocara to patch one element. You can go
 to any module sub-directory and run 'make build' from there. 
 
+  Source directory
+
+The variable XSRCDIR can be set either in the environment or in
+/etc/mk.cof to point to the xenocara source tree, in case you keep it
+in a non-standard directory (the default is /usr/xenocara).
+
   Objdirs
 
 Xenocara supports objdirs (and it's even the recommended way to build
 things). Just run 'make obj' at any level before 'make build' to make
 sure that the object directories are created. 
-XENOCARA_OBJDIR defines the default obj directory that is used.
+XOBJDIR defines the default obj directory that is used.
 
   Shadow trees 
 
@@ -115,4 +125,4 @@ makefiles skeletons. For that use the following command:
 You can also set XENOCARA_RERUN_AUTOCONF in /etc/mk.conf to force
 regeneration of configure scripts in every component.
 
-$OpenBSD: README,v 1.7 2007/01/04 20:56:55 matthieu Exp $
+$OpenBSD: README,v 1.8 2007/03/31 20:25:53 matthieu Exp $

app/glxgears/Makefile

@@ -1,7 +1,7 @@
 # $Xenocara$
 .include <bsd.own.mk>
 X11BASE?=	/usr/X11R6
-DIST=		${XENOCARA_TOP}/dist/Mesa
+DIST=		${XSRCDIR}/dist/Mesa
 GLXGEARS=	${DIST}/progs/xdemos
 MANDIR=		${X11BASE}/man/cat
 

app/glxinfo/Makefile

@@ -1,7 +1,7 @@
 # $Xenocara$
 .include <bsd.own.mk>
 X11BASE?=	/usr/X11R6
-DIST=		${XENOCARA_TOP}/dist/Mesa
+DIST=		${XSRCDIR}/dist/Mesa
 GLXINFO=	${DIST}/progs/xdemos
 MANDIR=		${X11BASE}/man/cat
 

share/mk/bsd.xorg.mk

@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xorg.mk,v 1.18 2007/03/30 17:24:12 aanriot Exp $ -*- makefile  -*-
+# $OpenBSD: bsd.xorg.mk,v 1.19 2007/03/31 20:25:53 matthieu Exp $ -*- makefile  -*-
 #
 # Copyright <20> 2006 Matthieu Herrb
 #
@@ -23,10 +23,10 @@ AUTOMAKE_VERSION=	1.9
 AUTOCONF_VERSION=	2.59
 
 # Where source lives
-XENOCARA_TOP?=		/usr/xenocara
+XSRCDIR?=		/usr/src/xenocara
 
 # Where to build
-XENOCARA_OBJDIR?=	/usr/obj/xenocara
+XOBJDIR?=	/usr/xobj
 
 # Where to install
 BINDIR?=		${X11BASE}/bin
@@ -40,7 +40,7 @@ PKG_CONFIG_LIBDIR=	${X11BASE}/lib/pkgconfig
 INSTALL_DATA = ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 644
 
 # Autoconf cache
-_cache= --cache-file=${XENOCARA_OBJDIR}/xorg-config.cache.${MACHINE}
+_cache= --cache-file=${XOBJDIR}/xorg-config.cache.${MACHINE}
 
 CFLAGS+=	$(COPTS)
 
@@ -160,11 +160,11 @@ __objdir=	obj.$(MACHINE)
 __objdir=	obj
 . endif
 
-. if defined(XENOCARA_OBJMACHINE)
+. if defined(XOBJMACHINE)
-__xobjdir=	$(XENOCARA_OBJDIR).$(MACHINE)
+__xobjdir=	$(XOBJDIR).$(MACHINE)
 __xobjdirpf=
 . else
-__xobjdir=	$(XENOCARA_OBJDIR)
+__xobjdir=	$(XOBJDIR)
 .  if defined(OBJMACHINE)
 __xobjdirpf=	.$(MACHINE)
 .  else
@@ -176,8 +176,8 @@ _SUBDIRUSE:
 
 _xenocara_obj! _SUBDIRUSE
 	@cd $(.CURDIR); \
-	here=`/bin/pwd`; xenocara_top=`cd $(XENOCARA_TOP); /bin/pwd`; \
+	here=`/bin/pwd`; xsrcdir=`cd $(XSRCDIR); /bin/pwd`; \
-	subdir=$${here#$${xenocara_top}/}; \
+	subdir=$${here#$${xsrcdir}/}; \
 	if test $$here != $$subdir ; then \
 	    dest=${__xobjdir}/$$subdir${__xobjdirpf}; \
 	    echo "$$here/${__objdir} -> $$dest"; \

xserver/Makefile.bsd-wrapper

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2007/03/28 20:44:34 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.11 2007/03/31 20:25:53 matthieu Exp $
 
 DIST= ${.CURDIR}
 
@@ -15,7 +15,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --sysconfdir=/etc/X11 \
 		--with-xkb-path=/etc/X11/xkb \
 		--with-xkb-output=/var/db/xkb \
 		--with-module-dir=${LIBDIR}/modules \
-		--with-mesa-source=${XENOCARA_TOP}/dist/Mesa \
+		--with-mesa-source=${XSRCDIR}/dist/Mesa \
 		--enable-install-setuid --enable-privsep \
 		--disable-dmx ${NO_XORG_OPTION}