Module Name:	xsrc
Committed By:	jlam
Date:		Mon May 21 20:43:52 UTC 2001

Modified Files:
	xsrc/xfree/xc/config/cf: bsdLib.rules bsdLib.tmpl

Log Message:
Apply patch from xsrc/12935 to fix problems with building libraries when
X11ProjectRoot is defined.  From the description in the PR:

The following patch fixes bsdLib.rules and bsdLib.tmpl to use the proper
Makefile variables when building libraries.  In bsdLib.rules, instead
of passing $(USRLIBDIR) to the linker for the rpath, $(USRLIBDIRPATH) is
passed instead, which is already conditionally set to the correct value
depending on the definition of X11ProjectRoot.  In bsdLib.tmpl, instead of
using $(LDPRELIB), use $(LDPRELIBS) instead, which is a superset of the
value of $(LDPRELIB), but also conditionally contains linker directives to
search in $(X11PROJECT)/lib for libraries when X11ProjectRoot is defined.


To generate a diff of this commit:
cvs rdiff -r1.1.1.2 -r1.2 xsrc/xfree/xc/config/cf/bsdLib.rules \
    xsrc/xfree/xc/config/cf/bsdLib.tmpl

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