From 594eab89d5c035349dccd9c61a6a1848fc0d7062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= <suwako@076.moe>
Date: Sun, 31 Mar 2024 12:37:36 +0900
Subject: [PATCH] =?UTF-8?q?GNU=20Make=20=E2=86=92=20BSD=20Make?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile  | 10 +++++-----
 README.md | 32 +++++++++++++++++++++++---------
 main.go   |  4 ++--
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 0b6e68e..86218b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-NAME := $(shell cat main.go | grep "var sofname" | awk '{print $$4}' | sed "s/\"//g")
-VERSION := $(shell cat main.go | grep "var version" | awk '{print $$4}' | sed "s/\"//g")
+NAME!=cat main.go | grep "var sofname" | awk '{print $$4}' | sed "s/\"//g"
+VERSION!=cat main.go | grep "var version" | awk '{print $$4}' | sed "s/\"//g"
 # Linux、Haiku、Illumos = /usr、FreeBSDとOpenBSD = /usr/local、NetBSD = /usr/pkg
 PREFIX=/usr/local
 MANPREFIX=${PREFIX}/share/man
-# FreeBSD = /usr/local/etc、それ以外 = /etc
-CNFPREFIX=/etc
+# FreeBSD = /usr/local/etc、NetBSD = /usr/pkg/etc、それ以外 = /etc
+CNFPREFIX?=/etc
 CC=CGO_ENABLED=0 go build
 # リリース。なし＝デバッグ。
 RELEASE=-ldflags="-s -w" -buildvcs=false
@@ -48,7 +48,7 @@ dist: clean
 	rm -rf ${NAME}-${VERSION}
 
 config:
-	make -p ${DESTDIR}${CNFPREFIX}/spliti
+	mkdir -p ${DESTDIR}${CNFPREFIX}/spliti
 	cp config.json ${DESTDIR}${CNFPREFIX}/spliti
 
 install: all
diff --git a/README.md b/README.md
index ff8e518..5967c50 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,27 @@ git clone https://gitler.moe/suwako/spliti.git && cd spliti
 find . -type f -name "config.json" -exec sed -i 's/mixi.076.moe/$domain/g'
 ```
 
-### Linux
+### OpenBSD（オススメ）
 
 ```sh
 make
-doas make install PREFIX=/usr
+doas make install
 doas make config
+cd /etc
+wget https://076.moe/repo/webserver/relayd/spliti.conf
+mv spliti.conf relayd.conf
+find . -type f -name "/etc/relayd.conf" -exec sed -i 's/DOMAIN/$domain/g'
+rcctl restart relayd
+```
+
+### Linux
+
+**注意：BSD Makeをインストールして下さい。GNU Makeは未対応です。**
+
+```sh
+bmake
+doas bmake install PREFIX=/usr
+doas bmake config
 cp /etc/nginx/sites-enabled
 wget https://076.moe/repo/webserver/nginx/spliti.conf
 find . -type f -name "/etc/nginx/sites-enabled/spliti.conf" -exec sed -i 's/DOMAIN/$domain/g'
@@ -37,17 +52,16 @@ find . -type f -name "/usr/local/etc/nginx/sites-enabled/spliti.conf" -exec sed
 service nginx restart
 ```
 
-### OpenBSD
+### NetBSD
 
 ```sh
 make
 doas make install
-doas make config
-cd /etc
-wget https://076.moe/repo/webserver/relayd/spliti.conf
-mv spliti.conf relayd.conf
-find . -type f -name "/etc/relayd.conf" -exec sed -i 's/DOMAIN/$domain/g'
-rcctl restart relayd
+doas make config CNFPREFIX=/usr/pkg/etc
+cp srv/nginx.conf /usr/pkg/etc/nginx/sites-enabled/spliti.conf
+wget https://076.moe/repo/webserver/nginx/spliti.conf
+find . -type f -name "/usr/pkg/etc/nginx/sites-enabled/spliti.conf" -exec sed -i 's/DOMAIN/$domain/g'
+service nginx restart
 ```
 
 ## インスタンス一覧
diff --git a/main.go b/main.go
index 81d7c8c..b00b452 100644
--- a/main.go
+++ b/main.go
@@ -7,10 +7,10 @@ import (
 )
 
 var sofname = "spliti"
-var version = "2.1.0"
+var version = "2.2.0"
 
 func help() {
-  fmt.Println("０７６ spliti - mixi向けプライバシーUI")
+  fmt.Println("０７６ " + sofname + "-" + version + " - mixi向けプライバシーUI")
   fmt.Println("https://mixi.076.moe/ | https://gitler.moe/suwako/spliti")
   fmt.Println("")
   fmt.Println("使い方：")