From c2689c53c6c6413976662f99cd10d2ccdebe9525 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Wed, 26 Oct 2011 16:38:34 +0000
Subject: [PATCH] Move the setting of LD_RUN_PATH into sbbs3/Common.gmake

---
 src/sbbs3/Common.gmake         | 7 +++++++
 src/sbbs3/userlist/GNUmakefile | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/sbbs3/Common.gmake b/src/sbbs3/Common.gmake
index 0a31d3a5fc..2d74bf7522 100644
--- a/src/sbbs3/Common.gmake
+++ b/src/sbbs3/Common.gmake
@@ -14,6 +14,13 @@ SBBS_LDFLAGS	+=	-L$(SBBS_SRC)/$(LIBODIR)
 
 SBBSLIBS	+=	-lsbbs
 
+ifdef SBBSDIR
+LD_RUN_PATH	:=	$(SBBSDIR)/exec:$(SBBS_SRC)/$(LIBODIR)
+else
+LD_RUN_PATH	:=	$(SBBS_SRC)/$(LIBODIR)
+endif
+export LD_RUN_PATH
+
 $(SBBS):
 	$(MAKE) -C $(SBBS_SRC) $(LIBODIR)$(DIRSEP)$(LIBPREFIX)sbbs$(SOFILE)
 
diff --git a/src/sbbs3/userlist/GNUmakefile b/src/sbbs3/userlist/GNUmakefile
index bb5a6d2aed..f0756964d5 100644
--- a/src/sbbs3/userlist/GNUmakefile
+++ b/src/sbbs3/userlist/GNUmakefile
@@ -22,12 +22,6 @@ include ../Common.gmake
 CFLAGS	+=	$(SBBS_CFLAGS) $(SMBLIB_CFLAGS) $(XPDEV-MT_CFLAGS) `wx-config --unicode --cflags`
 CXXFLAGS	+= $(CFLAGS)
 LDFLAGS	+=	`wx-config --unicode --libs` $(SMBLIB_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS) $(SBBS_LDFLAGS) 
-ifdef SBBSDIR
-LD_RUN_PATH	:=	$(SBBSDIR)/exec:$(SBBS_SRC)/$(LIBODIR)
-else
-LD_RUN_PATH	:=	$(SBBS_SRC)/$(LIBODIR)
-endif
-export LD_RUN_PATH
 
 $(USERLIST): $(SBBS) $(OBJS)
 	@echo Linking $@
-- 
GitLab