From 932024a901fee2e6535bc6714137e499b0b54131 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Wed, 8 Sep 2004 22:01:16 +0000
Subject: [PATCH] Use LD_RUN_PATH env variable rather than the clumsy and
 annoying Xlinker options.

---
 src/sbbs3/GNUmakefile | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/sbbs3/GNUmakefile b/src/sbbs3/GNUmakefile
index 9c702b4b43..8e93c1b419 100644
--- a/src/sbbs3/GNUmakefile
+++ b/src/sbbs3/GNUmakefile
@@ -87,22 +87,8 @@ SBBSLIB	=	-lsbbs
 $(SBBSLIB) : $(SBBS)
 	$(QUIET)touch -- '$(SBBSLIB)'
 
-ifneq ($(os),darwin)
-ifneq ($(os),sunos)
-SBBSLDFLAGS	:=	$(LDFLAGS) -rpath-link ./$(LIBODIR) -rpath ./ 
-#LDFLAGS		+=	-Wl,-rpath-link,./$(LIBODIR),-rpath,./
-LDFLAGS		+=	-Xlinker -rpath
-LDFLAGS		+=	-Xlinker .
-ifneq ($(os),openbsd)
-LDFLAGS		+=	-Xlinker -rpath-link
-LDFLAGS		+=	-Xlinker ./$(LIBODIR)
-LDFLAGS		+=	-Xlinker -rpath-link
-LDFLAGS		+=	-Xlinker $(JSLIBDIR)
-LDFLAGS		+=	-Xlinker -rpath-link
-LDFLAGS		+=	-Xlinker $(NSPRDIR)
-endif
-endif
-endif
+LD_RUN_PATH	:=	.;./$(LIBODIR);$(JSLIBDIR);$(NSPRDIR)
+export LD_RUN_PATH
 
 CON_OBJS	= $(LIBODIR)/sbbscon.o $(LIBODIR)/conwrap.o \
 		  $(LIBODIR)/sbbs_ini.o
-- 
GitLab