Add generate-rpm

[rbdr/blog] / Makefile

diff --git a/Makefile b/Makefile
index 4c5c88000939e6d5188b86f5e4e444a77b030133..2caadd7939f9787198f55e378e9a0f41414e4b36 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,8 @@ build: prepare
        cargo build --profile $(profile) --target $(target)
 
 release: rpm tar
        cargo build --profile $(profile) --target $(target)
 
 release: rpm tar

-       rsync -avz $(app_name)-$(target)-$(channel).tar.gz deploy@build.r.bdr.sh:/srv/http/build.r.bdr.sh/$(app_name) target/$(target)/$(profile)/$(app_name)/$(app_name)-$(target)-$(channel).tar.gz
+       @$(eval filename := $(app_name)-$(target)-$(channel))
+       rsync -avz $(filename).tar.gz deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)

 
 $(architectures):
 ifneq ($(channel),)
 
 $(architectures):
 ifneq ($(channel),)


@@ -25,9 +26,11 @@ else
 endif
 
 rpm: build
 endif
 
 rpm: build

+       cargo generate-rpm --profile $(profile) --target $(target)

 
 tar: build
 
 tar: build

-       tar -czvf $(app_name)-$(target)-$(channel).tar.gz -C target/$(target)/$(profile)/ $(app_name)
+       @$(eval filename := $(app_name)-$(target)-$(channel))
+       tar -czvf $(filename).tar.gz -C target/$(target)/$(profile)/ $(app_name)

 
 package: $(architectures)
 
 
 package: $(architectures)