From 7add5ffa215525c20a6f8df42f2bf83fc9ca15e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= Date: Tue, 16 Apr 2024 00:39:52 +0900 Subject: [PATCH 1/2] =?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 --- CHANGELOG.md | 1 + Makefile | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3339f36..b0aca53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # 1.3.0 * 英訳の追加 +* GNU Make → BSD Make # 1.2.0 * やっとTOTP機能性を修正した diff --git a/Makefile b/Makefile index b6f30ff..0f9269d 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,19 @@ -UNAME_S := $(shell uname -s) +UNAME_S!=uname -s -NAME := $(shell cat main.c | grep "const char\* sofname" | awk '{print $$5}' | sed "s/\"//g" | sed "s/;//" ) -VERSION := $(shell cat main.c | grep "const char\* version" | awk '{print $$5}' | sed "s/\"//g" | sed "s/;//" ) +NAME!=cat main.c | grep "const char\* sofname" | awk '{print $$5}' | sed "s/\"//g" | sed "s/;//" +VERSION!=cat main.c | grep "const char\* version" | awk '{print $$5}' | sed "s/\"//g" | sed "s/;//" +PREFIX=/usr/local + +.if ${UNAME_S} == "FreeBSD" +MANPREFIX=${PREFIX}/share/man +.elif ${UNAME_S} == "Linux" PREFIX=/usr MANPREFIX=${PREFIX}/share/man -ifeq ($(UNAME_S),FreeBSD) - PREFIX=/usr/local -endif -ifeq ($(UNAME_S),OpenBSD) - PREFIX=/usr/local - MANPREFIX=${PREFIX}/man -endif -ifeq ($(UNAME_S),NetBSD) - PREFIX=/usr/pkg -endif +.elif ${UNAME_S} == "NetBSD" +PREFIX=/usr/pkg +MANPREFIX=${PREFIX}/share/man +.endif + CC=cc FILES=main.c showpass.c yankpass.c addpass.c delpass.c listpass.c genpass.c initpass.c otppass.c base32.c CFLAGS=-Wall -Wextra -O3 -I${PREFIX}/include -L${PREFIX}/lib From 8ea7ebd47d6dcaefba1febdc42f9ad956486f793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= Date: Tue, 16 Apr 2024 00:40:50 +0900 Subject: [PATCH 2/2] =?UTF-8?q?GPLv2=20=E2=86=92=20ISC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + LICENSE.txt | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0aca53..c9f4084 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 1.3.0 * 英訳の追加 * GNU Make → BSD Make +* GPLv2 → ISC # 1.2.0 * やっとTOTP機能性を修正した diff --git a/LICENSE.txt b/LICENSE.txt index e69de29..c4d9131 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -0,0 +1,14 @@ +Copyright © 2004-2011 by Internet Systems Consortium, Inc. ("ISC") +Copyright © 2018-2024 by 076.moe + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE.