mirror/cloudflare-gortr
1
0
Fork 0
mirror of https://github.com/cloudflare/gortr.git synced 2024-05-19 06:50:10 +00:00
Code Issues Releases Wiki Activity

fix Makefile bad merge

Browse Source
This commit is contained in:
Louis Poinsignon
2020-11-23 18:18:57 -08:00
parent 13c7a34bfc
commit 6ec9302f8d
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -70,7 +70,6 @@ docker-rtrmon:
.PHONY: package-deb-gortr
package-deb-gortr: prepare
fpm -s dir -t deb -n $(GORTR_NAME) -v $(VERSION_PKG) \
<<<<<<< HEAD
--description "$(DESCRIPTION)" \
--url "$(URL)" \
--architecture $(ARCH) \
@ -82,20 +81,6 @@ package-deb-gortr: prepare
cmd/gortr/cf.pub=/usr/share/gortr/cf.pub \
$(OUTPUT_RTRDUMP)=/usr/bin/rtrdump \
$(OUTPUT_RTRMON)=/usr/bin/rtrmon
=======
--description "$(DESCRIPTION)" \
--url "$(URL)" \
--architecture $(ARCH) \
--license "$(LICENSE)" \
--deb-no-default-config-files \
--package $(DIST_DIR) \
$(OUTPUT_GORTR)=/usr/bin/gortr \
package/gortr.service=/lib/systemd/system/gortr.service \
package/gortr.env=/etc/default/gortr \
cmd/gortr/cf.pub=/usr/share/gortr/cf.pub \
$(OUTPUT_RTRDUMP)=/usr/bin/rtrdump \
$(OUTPUT_RTRMON)=/usr/bin/rtrmon
>>>>>>> fix indentation
.PHONY: package-rpm-gortr
package-rpm-gortr: prepare