Combine {BSD,GNU}makefiles together, as GNU Make 4.0 supports != assignment

diff --git a/BSDmakefile b/BSDmakefile
deleted file mode 100644 (file)
index b57abb4..0000000
--- a/BSDmakefile
+++ /dev/null
@@ -1,4 +0,0 @@
-GOPATH != pwd
-VERSION != cat VERSION
-
-include common.mk

diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644 (file)
index 79efdfc..0000000
--- a/GNUmakefile
+++ /dev/null
@@ -1,4 +0,0 @@
-GOPATH = $(shell pwd)
-VERSION = $(shell cat VERSION)
-
-include common.mk

diff --git a/common.mk b/Makefile
similarity index 97%
rename from common.mk
rename to Makefile
index 6a4b3f6ccc9d237a48bf337067e3bc83e45f768a..46ddcf098f5fa750c69ecf538eee0b1cca063dc7 100644 (file)
--- a/common.mk
+++ b/Makefile
@@ -1,3 +1,6 @@
+GOPATH != pwd
+VERSION != cat VERSION
+
 GO ?= go
 PREFIX ?= /usr/local
 

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index bd6580edb28c942749ff27e69f3289f5952893da..b26f5666e6e127e206be18fd7295cee38bdebc18 100644 (file)
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
 BUILD_DEPENDS= go:lang/go
 
 USES=          tar:xz
-MAKEFILE=      BSDmakefile
 USE_RC_SUBR=   nncp-caller nncp-daemon nncp-toss
 INSTALL_TARGET=        install-strip