Index: src/Makefile.global.in
===================================================================
RCS file: /cvsroot/pgsql-server/src/Makefile.global.in,v
retrieving revision 1.155
retrieving revision 1.156
diff -c -c -r1.155 -r1.156
*** src/Makefile.global.in	4 Sep 2002 22:54:18 -0000	1.155
--- src/Makefile.global.in	10 Nov 2002 00:37:28 -0000	1.156
***************
*** 189,194 ****
--- 189,197 ----
  LD = @LD@
  with_gnu_ld = @with_gnu_ld@
  ld_R_works = @ld_R_works@
+ # Set trpath to a list of library paths included in LDFLAGS
+ # These paths can be added to rpath in the port specific makefiles if needed.
+ trpath = $(filter -L%,@LDFLAGS@)
  LDFLAGS = @LDFLAGS@
  LDREL = -r
  LDOUT = -o
Index: src/makefiles/Makefile.unixware
===================================================================
RCS file: /cvsroot/pgsql-server/src/makefiles/Makefile.unixware,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -c -r1.14 -r1.15
*** src/makefiles/Makefile.unixware	4 Sep 2002 22:54:18 -0000	1.14
--- src/makefiles/Makefile.unixware	10 Nov 2002 00:37:28 -0000	1.15
***************
*** 7,15 ****
  
  ifeq ($(ld_R_works), yes)
  ifeq ($(with_gnu_ld), yes)
! 	rpath = -Wl,-rpath,$(libdir)
  else
! 	rpath = -Wl,-R$(libdir)
  endif
  endif
  shlib_symbolic = -Wl,-Bsymbolic
--- 7,29 ----
  
  ifeq ($(ld_R_works), yes)
  ifeq ($(with_gnu_ld), yes)
! 	# Convert the list of library search paths into -rpath options
! 	# (i.e. "-LpathA -LpathB" -> ",-rpath,pathA,-rpath,pathB"), adding
! 	# the contents of LD_LIBRARY_PATH if it exists.
! 	tpath1=$(shell echo $(trpath) | sed -e 's/ *-L/,-rpath,/g')
! ifdef LD_LIBRARY_PATH
! 	tpath2 = ,-rpath,tpath+=$(shell echo $(LD_LIBRARY_PATH) | sed -e 's/:/,-rpath,/g')
! endif
! 	rpath = -Wl,-rpath,$(libdir)$(tpath)$(tpath2)
  else
! 	# Convert the list of library search paths into a -R option path
! 	# (i.e. "-LpathA -LpathB" -> ":pathA:pathB"), adding the contents of
! 	# LD_LIBRARY_PATH if it exists.
! 	tpath1 = $(shell echo $(trpath) | sed -e 's/ *-L/:/g')
! ifdef LD_LIBRARY_PATH
! 	tpath2 = :$(LD_LIBRARY_PATH)
! endif
! 	rpath = -Wl,-R$(libdir)$(tpath1)$(tpath2)
  endif
  endif
  shlib_symbolic = -Wl,-Bsymbolic