From: 諏訪子 <suwako@076.moe>
Date: Mon, 4 Nov 2024 10:30:02 +0000 (+0900)
Subject: Merge branch 'master' of gitler.moe:suwako/sp
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=sp.git

Merge branch 'master' of gitler.moe:suwako/sp
---

0814c8559fd2c5157759be83adc0bed6bbc424ab
diff --cc CHANGELOG.md
index f3a67eb,f3a67eb..b68a483
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,6 -6,6 +6,7 @@@
  * ワンタイムパスワード（OTP）を表示せずにコピー機能性の追加
  * Wayland対応の追加
  * コピータイムアウトの間にCTRL+Cを押したら、クリップボードから取り消す様に
++* コンフィグファイルの追加
  
  # 1.4.0
  * Haiku対応
diff --cc Makefile
index 5845c4f,6e90dfc..0355383
--- a/Makefile
+++ b/Makefile
@@@ -112,11 -92,15 +119,15 @@@ man
  	sed "s/VERSION/${VERSION}/g" < man/${NAME}-jp.1 > \
  		release/man/${VERSION}/${NAME}-jp.1
  
+ config:
+ 	mkdir -p ${DESTDIR}${DATAPREFIX}/sp/example
+ 	cp -f ${NAME}.conf ${DESTDIR}${DATAPREFIX}/sp/example
+ 
  release:
 -	mkdir -p release/bin/${VERSION}/${OS}/${UNAME_M}
 -	${CC} -O3 ${CFLAGS} -o release/bin/${VERSION}/${OS}/${UNAME_M}/${NAME} ${FILES} \
 +	mkdir -p release/bin/${VERSION}/${OS}/${ARCH}
 +	${CC} -O3 ${CFLAGS} -o release/bin/${VERSION}/${OS}/${ARCH}/${NAME} ${FILES} \
  		-static ${LDFLAGS}
 -	strip release/bin/${VERSION}/${OS}/${UNAME_M}/${NAME}
 +	strip release/bin/${VERSION}/${OS}/${ARCH}/${NAME}
  
  install:
  	mkdir -p ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANPREFIX}/man1