Use convenient simpler Go 1.9's sync.Map

[govpn.git] / common.mk

diff --git a/common.mk b/common.mk
index 576f35f18b8340efd30d5612d89cfc4c6e864913..988964fdd09892feaf487460efc952847abeb682 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,6 @@
-LDFLAGS = -X govpn.Version $(VERSION)
+.PHONY: doc
+
+LDFLAGS = -X cypherpunks.ru/govpn.Version=$(VERSION)
 PREFIX ?= /usr/local
 BINDIR = $(DESTDIR)$(PREFIX)/bin
 INFODIR = $(DESTDIR)$(PREFIX)/info
@@ -8,16 +10,16 @@ DOCDIR = $(DESTDIR)$(PREFIX)/share/doc/govpn
 all: govpn-client govpn-server govpn-verifier
 
 govpn-client:
-       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" govpn/cmd/govpn-client
+       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/govpn/cmd/govpn-client
 
 govpn-server:
-       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" govpn/cmd/govpn-server
+       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/govpn/cmd/govpn-server
 
 govpn-verifier:
-       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" govpn/cmd/govpn-verifier
+       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/govpn/cmd/govpn-verifier
 
 bench:
-       cd src/govpn ; GOPATH=$(GOPATH) go test -bench .
+       GOPATH=$(GOPATH) go test -benchmem -bench . cypherpunks.ru/govpn/...
 
 clean:
        rm -f govpn-client govpn-server govpn-verifier
@@ -33,11 +35,14 @@ install: all doc
        cp -f doc/govpn.info $(INFODIR)
        chmod 644 $(INFODIR)/govpn.info
        mkdir -p $(SHAREDIR)
-       cp -f utils/newclient.sh utils/storekey.sh $(SHAREDIR)
-       chmod 755 $(SHAREDIR)/newclient.sh $(SHAREDIR)/storekey.sh
+       cp -f utils/newclient.sh $(SHAREDIR)
+       chmod 755 $(SHAREDIR)/newclient.sh
        mkdir -p $(DOCDIR)
-       cp -f -L AUTHORS INSTALL NEWS README THANKS $(DOCDIR)
-       chmod 644 $(DOCDIR)/AUTHORS $(DOCDIR)/INSTALL $(DOCDIR)/NEWS $(DOCDIR)/README $(DOCDIR)/THANKS
+       cp -f -L AUTHORS INSTALL NEWS NEWS.RU README README.RU THANKS $(DOCDIR)
+       chmod 644 $(DOCDIR)/*
 
 install-strip: install
        strip $(BINDIR)/govpn-client $(BINDIR)/govpn-server $(BINDIR)/govpn-verifier
+
+dist:
+       ./utils/makedist.sh $(VERSION)