Module Name:	xsrc
Committed By:	jwise
Date:		Sun Oct 14 23:56:18 UTC 2001

Modified Files:
	xsrc: Makefile

Log Message:
Fix a long-standing problem with builds with USE_XF86_4 set.

In XFree86 4.x, the `contrib' sources have been moved into xc/programs, so this
Makefile as it stood, was building those programs which had traditionally been
part of `contrib' from there and then overwriting them with XF86 3.x versions
from ./contrib.

Now, we don't descend into ./contrib if we are building from XF86 4.  This has
been verified to DTRT.


To generate a diff of this commit:
cvs rdiff -r1.28 -r1.29 xsrc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.