From f0b3de1c6e3133bd69cffc136d8136b8008d8ae6 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Mon, 3 Apr 2017 10:05:28 -0400 Subject: [PATCH] update build.sh to use in repo source for daemon --- build.sh | 16 ++++++---------- contrib/backends/srndv2/Makefile | 4 +++- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/build.sh b/build.sh index 7036155..0e2b624 100755 --- a/build.sh +++ b/build.sh @@ -109,14 +109,10 @@ if [ "$ipfs" == "yes" ] ; then echo -e "Built\n" echo "Now configure NNTPChan with ./srndv2 setup" else - if [ "$unstable" == "yes" ] ; then - make -C contrib/backends/srndv2 - cp contrib/backends/srndv2/nntpchand "$root/nntpchan" - echo "built unstable, if you don't know what to do, run without --unstable" - else - go get -u -v $tags github.com/majestrate/srndv2 - cp "$GOPATH/bin/srndv2" "$root" - echo -e "Built\n" - echo "Now configure NNTPChan with ./srndv2 setup" - fi + echo "building the daemon..." + echo + make -C contrib/backends/srndv2 + cp contrib/backends/srndv2/srndv2 . + echo "built" + echo "now configure NNTPChan with ./srndv2 setup" fi diff --git a/contrib/backends/srndv2/Makefile b/contrib/backends/srndv2/Makefile index e324d23..53d2a9c 100644 --- a/contrib/backends/srndv2/Makefile +++ b/contrib/backends/srndv2/Makefile @@ -1,6 +1,8 @@ REPO=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -all: srndv2 +all: clean build + +build: srndv2 srndv2: GOPATH=$(REPO) go build -v