diff --git a/src/sbbs3/Common.gmake b/src/sbbs3/Common.gmake index 0a31d3a5fc4fc6ada068a2a80afdad26fdc6aab5..2d74bf7522fdea6b5c40f7979a7c7e2d1bfe425c 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 bb5a6d2aed55948f618df9e20336229faec57907..f0756964d5b92114ac356839e472506e160679c1 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 $@