From bbb25ef2ebe215e59d72f6168c286f5466ae2da5 Mon Sep 17 00:00:00 2001 From: donmor Date: Mon, 21 Jul 2025 14:21:32 +0800 Subject: [PATCH 1/4] Update Makefile Add `install` target that can be invoked by `# make install`; DESTDIR/prefix is supported --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 603aeabd..40877bd6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ export PATH := $(PATH):`go env GOPATH`/bin export GO111MODULE=on LDFLAGS := -s -w +prefix ?= /usr/local all: env fmt build @@ -69,3 +70,11 @@ clean: rm -f ./bin/frpc rm -f ./bin/frps rm -rf ./lastversion + +install: + install -Dm755 bin/frps ${DESTDIR}${prefix}/bin/frps + install -Dm755 bin/frpc ${DESTDIR}${prefix}/bin/frpc + install -Dm644 -b confi/frps.toml ${DESTDIR}${prefix}/etc/frp/frps.toml + install -Dm644 -b confi/frpc.toml ${DESTDIR}${prefix}/etc/frp/frpc.toml + install -Dm644 confi/frps_full_example.toml ${DESTDIR}${prefix}/etc/frp/frps_full_example.toml + install -Dm644 confi/frpc_full_example.toml ${DESTDIR}${prefix}/etc/frp/frpc_full_example.toml From 9cf221346a70623731dba4301fced83e0e0f9160 Mon Sep 17 00:00:00 2001 From: donmor Date: Mon, 21 Jul 2025 14:26:54 +0800 Subject: [PATCH 2/4] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 40877bd6..eb79e299 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ clean: install: install -Dm755 bin/frps ${DESTDIR}${prefix}/bin/frps install -Dm755 bin/frpc ${DESTDIR}${prefix}/bin/frpc - install -Dm644 -b confi/frps.toml ${DESTDIR}${prefix}/etc/frp/frps.toml - install -Dm644 -b confi/frpc.toml ${DESTDIR}${prefix}/etc/frp/frpc.toml - install -Dm644 confi/frps_full_example.toml ${DESTDIR}${prefix}/etc/frp/frps_full_example.toml - install -Dm644 confi/frpc_full_example.toml ${DESTDIR}${prefix}/etc/frp/frpc_full_example.toml + install -Dm644 -b confi/frps.toml ${DESTDIR}/etc/frp/frps.toml + install -Dm644 -b confi/frpc.toml ${DESTDIR}/etc/frp/frpc.toml + install -Dm644 confi/frps_full_example.toml ${DESTDIR}/etc/frp/frps_full_example.toml + install -Dm644 confi/frpc_full_example.toml ${DESTDIR}/etc/frp/frpc_full_example.toml From ef47f567ca6f21a8229333924f2863b26033d29c Mon Sep 17 00:00:00 2001 From: donmor Date: Mon, 21 Jul 2025 15:12:19 +0800 Subject: [PATCH 3/4] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index eb79e299..28e0189f 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ clean: install: install -Dm755 bin/frps ${DESTDIR}${prefix}/bin/frps install -Dm755 bin/frpc ${DESTDIR}${prefix}/bin/frpc - install -Dm644 -b confi/frps.toml ${DESTDIR}/etc/frp/frps.toml - install -Dm644 -b confi/frpc.toml ${DESTDIR}/etc/frp/frpc.toml - install -Dm644 confi/frps_full_example.toml ${DESTDIR}/etc/frp/frps_full_example.toml - install -Dm644 confi/frpc_full_example.toml ${DESTDIR}/etc/frp/frpc_full_example.toml + install -Dm644 -b config/frps.toml ${DESTDIR}/etc/frp/frps.toml + install -Dm644 -b config/frpc.toml ${DESTDIR}/etc/frp/frpc.toml + install -Dm644 config/frps_full_example.toml ${DESTDIR}/etc/frp/frps_full_example.toml + install -Dm644 config/frpc_full_example.toml ${DESTDIR}/etc/frp/frpc_full_example.toml From d85202c76e40d596be7d9ee032561c8b317e0da0 Mon Sep 17 00:00:00 2001 From: donmor Date: Mon, 21 Jul 2025 15:39:18 +0800 Subject: [PATCH 4/4] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 28e0189f..4e480b1d 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ clean: install: install -Dm755 bin/frps ${DESTDIR}${prefix}/bin/frps install -Dm755 bin/frpc ${DESTDIR}${prefix}/bin/frpc - install -Dm644 -b config/frps.toml ${DESTDIR}/etc/frp/frps.toml - install -Dm644 -b config/frpc.toml ${DESTDIR}/etc/frp/frpc.toml - install -Dm644 config/frps_full_example.toml ${DESTDIR}/etc/frp/frps_full_example.toml - install -Dm644 config/frpc_full_example.toml ${DESTDIR}/etc/frp/frpc_full_example.toml + install -Dm644 -b conf/frps.toml ${DESTDIR}/etc/frp/frps.toml + install -Dm644 -b conf/frpc.toml ${DESTDIR}/etc/frp/frpc.toml + install -Dm644 conf/frps_full_example.toml ${DESTDIR}/etc/frp/frps_full_example.toml + install -Dm644 conf/frpc_full_example.toml ${DESTDIR}/etc/frp/frpc_full_example.toml