From e85d181af21e2b21eb76d4f0548a0b6eb59027cd Mon Sep 17 00:00:00 2001 From: Rob Swindell <rob@synchro.net> Date: Mon, 23 Nov 2020 00:44:02 -0800 Subject: [PATCH] Fix SBJ, TBD, and DPOKER builds when installed withOUT SYMLINK=1 Needed to pass path to the "src" (SRC_ROOT), not SBBS_SRC. Also updated the gitlab URLs to use main/sbbs instead of sbbs/sbbs. --- install/GNUmakefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install/GNUmakefile b/install/GNUmakefile index 3b7980c035..303c84763b 100644 --- a/install/GNUmakefile +++ b/install/GNUmakefile @@ -160,13 +160,13 @@ baja: run sbbs3 $(MAKE) -C $(SBBSDIR)/exec $(MKFLAGS) BAJAPATH=$(REPODIR)/src/sbbs3/$(CCPRE).$(machine).exe.$(BUILDPATH)/baja sbj: run - $(MAKE) -C $(SBBSDIR)/xtrn/sbj $(MKFLAGS) + $(MAKE) -C $(SBBSDIR)/xtrn/sbj $(MKFLAGS) SRC_ROOT=$(REPODIR)/src XPDEV=$(REPODIR)/src/xpdev/ dpoker: run - $(MAKE) -C $(SBBSDIR)/xtrn/dpoker $(MKFLAGS) SBBS_SRC=$(REPODIR)/src/sbbs3/ XPDEV=$(REPODIR)/src/xpdev/ + $(MAKE) -C $(SBBSDIR)/xtrn/dpoker $(MKFLAGS) SRC_ROOT=$(REPODIR)/src XPDEV=$(REPODIR)/src/xpdev/ tbd: run - $(MAKE) -C $(SBBSDIR)/xtrn/tbd $(MKFLAGS) SBBS_SRC=$(REPODIR)/src/sbbs3/ XPDEV=$(REPODIR)/src/xpdev/ + $(MAKE) -C $(SBBSDIR)/xtrn/tbd $(MKFLAGS) SRC_ROOT=$(REPODIR)/src XPDEV=$(REPODIR)/src/xpdev/ gtkuseredit: src ifdef USE_GLADE @@ -245,8 +245,8 @@ endif $(REPODIR): git clone https://gitlab.com/SynchronetBBS/sbbs.git $(REPODIR) \ || git clone https://github.com/SynchronetBBS/sbbs.git $(REPODIR) \ - || git clone https://gitlab.synchro.net/sbbs/sbbs.git $(REPODIR) - git -C $(REPODIR) remote set-url origin https://gitlab.synchro.net/sbbs/sbbs.git + || git clone https://gitlab.synchro.net/main/sbbs.git $(REPODIR) + git -C $(REPODIR) remote set-url origin https://gitlab.synchro.net/main/sbbs.git ifdef TAG git -C $(REPODIR) checkout tags/$(TAG) endif -- GitLab