switch to make build for packaging (#1279)

* switch to make build for packaging * build as first target Co-authored-by: sabban <[email protected]>
crowdsecurity · Feb 18, 2022 · 2763366 · 2763366
1 parent 75ba0e2
commit 2763366
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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