From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 13 Nov 2019 07:27:26 +0000 (+0300)
Subject: Combine {BSD,GNU}makefiles together, as GNU Make 4.0 supports != assignment
X-Git-Tag: v5.0.0^2~11
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=b120877e6282de3a7573d0ff33ff77de7766961e

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

diff --git a/BSDmakefile b/BSDmakefile
deleted file mode 100644
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
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 6a4b3f6..46ddcf0 100644
--- 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 bd6580e..b26f566 100644
--- 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