X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=bin%2Fdefault.do;h=352b014bd5aed5b9eca8d6e6f7bb315639ef43d5;hb=d182e82482b61ac3b0e9e0005ca7a018acf899f1;hp=bda5482d13c257e5af603ebd17e3d37652d12d9b;hpb=d2d8534d4121467ba132f8682cdf66f9907630e9;p=nncp.git

diff --git a/bin/default.do b/bin/default.do
index bda5482..352b014 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.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 -ldflags "$GO_LDFLAGS" ./cmd/$1