From 0a30202cf83ce5fa5324cff275065639e7cc5699 Mon Sep 17 00:00:00 2001
From: Rob Swindell <rob@synchro.net>
Date: Wed, 30 Sep 2020 19:06:50 -0700
Subject: [PATCH] Install webv4 too and use symlinks for most directories.

The webv4 directory is now part of the repo, so install it to the
install target directory too.

When SYMLINK=1 is used, symlink the following directories (rather
than copying): docs, exec, text, web, webv4, and xtrn. This will
hopefully make subsequenit updating (via git) easier for most sysops that use
this installation method. Let the merge conflicts insue.
---
 install/GNUmakefile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/install/GNUmakefile b/install/GNUmakefile
index afb78f743d..c944b26b8d 100644
--- a/install/GNUmakefile
+++ b/install/GNUmakefile
@@ -40,7 +40,7 @@ endif
 ifdef SYMLINK
  INSBIN	:=	ln -sf
 else
- INSBIN	:=	cp
+ INSBIN	:=	cp -r
 endif
 
 ifdef bcc
@@ -253,28 +253,31 @@ endif
 
 src: $(REPODIR)
 
-run: $(SBBSDIR)/ctrl $(SBBSDIR)/docs $(SBBSDIR)/exec $(SBBSDIR)/node1 $(SBBSDIR)/text $(SBBSDIR)/web $(SBBSDIR)/xtrn
+run: $(SBBSDIR)/ctrl $(SBBSDIR)/docs $(SBBSDIR)/exec $(SBBSDIR)/node1 $(SBBSDIR)/text $(SBBSDIR)/web $(SBBSDIR)/webv4 $(SBBSDIR)/xtrn
 
 $(SBBSDIR)/ctrl: $(REPODIR)
 	cp -r $(REPODIR)/ctrl $(SBBSDIR)
 
 $(SBBSDIR)/docs: $(REPODIR)
-	cp -r $(REPODIR)/docs $(SBBSDIR)
+	$(INSBIN) $(REPODIR)/docs $(SBBSDIR)
 
 $(SBBSDIR)/exec: $(REPODIR)
-	cp -r $(REPODIR)/exec $(SBBSDIR)
+	$(INSBIN) $(REPODIR)/exec $(SBBSDIR)
 
 $(SBBSDIR)/node1: $(REPODIR)
 	cp -r $(REPODIR)/node1 $(SBBSDIR)
 
 $(SBBSDIR)/text: $(REPODIR)
-	cp -r $(REPODIR)/text $(SBBSDIR)
+	$(INSBIN) $(REPODIR)/text $(SBBSDIR)
 
 $(SBBSDIR)/web: $(REPODIR)
-	cp -r $(REPODIR)/web $(SBBSDIR)
+	$(INSBIN) $(REPODIR)/web $(SBBSDIR)
+
+$(SBBSDIR)/webv4: $(REPODIR)
+	$(INSBIN) $(REPODIR)/webv4 $(SBBSDIR)
 
 $(SBBSDIR)/xtrn: $(REPODIR)
-	cp -r $(REPODIR)/xtrn $(SBBSDIR)
+	$(INSBIN) $(REPODIR)/xtrn $(SBBSDIR)
 
 $(SBBSDIR):
 	@[ ! -e $(SBBSDIR) ] && mkdir $(SBBSDIR);
-- 
GitLab