From 192b426e50012f64a23f5ea3e0cc894a35c849e8 Mon Sep 17 00:00:00 2001 From: TolaMironcenko Date: Thu, 26 Dec 2024 16:07:33 +0700 Subject: [PATCH] updated Makefile and PKGBUILD --- .gitignore | 1 + Makefile | 17 +++++++++++++---- PKGBUILD | 41 +++++++++++------------------------------ 3 files changed, 25 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 6f5884b..0f74cc4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.DS_Storepkg/ pwdgen-1.0-1-x86_64.pkg.tar.gz pkg +arch \ No newline at end of file diff --git a/Makefile b/Makefile index ad61f2d..67e1fd6 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,14 @@ CC = gcc CFLAGS = -Wall -std=c17 OUT = pwdgen SRC = src/*.c +BUILDDIR=build DESTDIR = /usr/local/bin build: - @$(CC) $(CFLAGS) $(SRC) -o out/$(OUT) + @if [ ! -d ${BUILDDIR} ]; then \ + mkdir -pv ${BUILDDIR}; \ + fi + @$(CC) $(CFLAGS) $(SRC) -o ${BUILDDIR}/$(OUT) all: @make clean @@ -13,10 +17,15 @@ all: @make run run: - @./out/$(OUT) + @./${BUILDDIR}/$(OUT) clean: - @rm -rf out/$(OUT) + @if [ -d ${BUILDDIR} ]; then \ + rm -rv ${BUILDDIR}; \ + fi install: - @cp -rf out/$(OUT) $(DESTDIR) + @if [ ! -d ${DESTDIR} ]; then \ + mkdir -pv ${DESTDIR}; \ + fi + @cp -rf ${BUILDDIR}/$(OUT) $(DESTDIR) diff --git a/PKGBUILD b/PKGBUILD index 59e3dec..9d903a4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,44 +1,25 @@ # Maintainer: Tola Mironcenko -pkgname=pwdgen +pkgname=pwdgen-git +_pkgname="${pkgname%-git}" +_reponame=pwdgen pkgver=1.0 pkgrel=1 -epoch= -pkgdesc="" +pkgdesc="Password generator" arch=('x86_64') -url="" +url="https://gitea.home.com:3000/TolaMironcenko/pwdgen" +conflicts=("$_pkgname") license=('GPL') -groups=() -depends=() -makedepends=() -checkdepends=() -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -changelog= -noextract=() -md5sums=() -validpgpkeys=() -#source=("git+https://github.com/TolaMironcenko/pwdgen.git") - -#prepare() { -# cd $pkgname -# mkdir -v out -#} +source=("git+$url.git") +cksums=('SKIP') build() { - #cd $pkgname - cd $HOME/Documents/c/pwdgen - [ ! -d out ] && mkdir out + cd $_reponame + make clean make } package() { - #cd $pkgname - cd $HOME/Documents/c/pwdgen + cd $_reponame mkdir -p $pkgdir/usr/local/bin make DESTDIR="$pkgdir/usr/local/bin/" install }