X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=bin%2Fdefault.do;h=52c55015310d0d9120c354e5fe4f42c2b4f47e3f;hb=faaae8532c13107cc7c4c7aed9d7bffa84d0761d;hp=8ec11e70b5795609ab9d702557b4d21af70a76ec;hpb=5bb9612250d3cc30c1cf76526f19d6d17cd1cbb4;p=nncp.git

diff --git a/bin/default.do b/bin/default.do
index 8ec11e7..52c5501 100644
--- a/bin/default.do
+++ b/bin/default.do
@@ -1,12 +1,10 @@
-cd ..
-redo-ifchange config gopath module-name
-. ./config
-. ./gopath
-mod=`cat module-name`
-redo-ifchange src/*.go src/cmd/$1/*.go
+cd ../src
+redo-ifchange ../config *.go cmd/${1##*/}/*.go
+. ../config
+GO=${GO:-go}
+mod=`$GO list -m`
 GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultCfgPath=$CFGPATH"
-GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultSpoolPath=$SENDMAIL"
+GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultSendmailPath=$SENDMAIL"
 GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultSpoolPath=$SPOOLPATH"
 GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultLogPath=$LOGPATH"
-cd src
-GOPATH=$GOPATH ${GO:-go} build -o ../bin/$3 -ldflags "$GO_LDFLAGS" $mod/cmd/$1
+$GO build -o ../bin/$3 $GO_CFLAGS -ldflags "$GO_LDFLAGS" ./cmd/${1##*/}