More reliable redo target

[nncp.git] / bin / default.do

diff --git a/bin/default.do b/bin/default.do
index 352b014bd5aed5b9eca8d6e6f7bb315639ef43d5..52c55015310d0d9120c354e5fe4f42c2b4f47e3f 100644 (file)
--- a/bin/default.do
+++ b/bin/default.do
@@ -1,5 +1,5 @@
 cd ../src
-redo-ifchange ../config *.go cmd/$1/*.go
+redo-ifchange ../config *.go cmd/${1##*/}/*.go
 . ../config
 GO=${GO:-go}
 mod=`$GO list -m`
@@ -7,4 +7,4 @@ 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"
-$GO build -o ../bin/$3 -ldflags "$GO_LDFLAGS" ./cmd/$1
+$GO build -o ../bin/$3 $GO_CFLAGS -ldflags "$GO_LDFLAGS" ./cmd/${1##*/}