From b120877e6282de3a7573d0ff33ff77de7766961e Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Wed, 13 Nov 2019 10:27:26 +0300 Subject: [PATCH] Combine {BSD,GNU}makefiles together, as GNU Make 4.0 supports != assignment --- BSDmakefile | 4 ---- GNUmakefile | 4 ---- common.mk => Makefile | 3 +++ ports/nncp/Makefile | 1 - 4 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 BSDmakefile delete mode 100644 GNUmakefile rename common.mk => Makefile (97%) 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 -- 2.44.0