From 276336630963501f2da6ad80c83a6b0c3a8a68c5 Mon Sep 17 00:00:00 2001
From: Manuel Sabban <github@sabban.eu>
Date: Fri, 18 Feb 2022 18:09:19 +0100
Subject: [PATCH] switch to make build for packaging (#1279)

* switch to make build for packaging
* build as first target

Co-authored-by: sabban <15465465+sabban@users.noreply.github.com>
---
 Makefile                | 6 +++---
 debian/rules            | 2 +-
 rpm/SPECS/crowdsec.spec | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 6a6b516fc..c077e7eae 100644
--- a/Makefile
+++ b/Makefile
@@ -66,12 +66,12 @@ GOTEST=$(GOCMD) test
 
 RELDIR = crowdsec-$(BUILD_VERSION)
 
-.PHONY: all
-all: clean test build
-
 .PHONY: build
 build: goversion crowdsec cscli plugins
 
+.PHONY: all
+all: clean test build
+
 .PHONY: static
 static: crowdsec_static cscli_static plugins_static
 
diff --git a/debian/rules b/debian/rules
index 761eaff4c..5b956ccd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_auto_install:
 # echo $($GOCMD version)
 # cd cmd/crowdsec && GOROOT=/tmp/go GO111MODULE=on $(GOBUILD) $(LD_OPTS) -o $(CROWDSEC_BIN) -v && cd ..
 # cd cmd/crowdsec-cli  && GOROOT=/tmp/go GO111MODULE=on $(GOBUILD) $(LD_OPTS) -o cscli -v && cd ..
-	make
+	make build
 	mkdir -p debian/crowdsec/usr/bin
 	mkdir -p debian/crowdsec/etc/crowdsec
 	mkdir -p debian/crowdsec/usr/share/crowdsec
diff --git a/rpm/SPECS/crowdsec.spec b/rpm/SPECS/crowdsec.spec
index dbd3c8b33..4cf486888 100644
--- a/rpm/SPECS/crowdsec.spec
+++ b/rpm/SPECS/crowdsec.spec
@@ -39,7 +39,7 @@ BuildRequires:  systemd
 %patch2
 
 %build
-BUILD_VERSION=%{local_version} make
+BUILD_VERSION=%{local_version} make build
 sed -i "s#/usr/local/lib/crowdsec/plugins/#%{_libdir}/%{name}/plugins/#g" config/config.yaml
 
 %install