From 265f0db2fb9da475b8b9e8a3bc5ebf220558a595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D1=82=D0=B0=D1=80=20=D0=9A=D0=B0=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D1=88?= Date: Wed, 12 May 2021 22:57:00 +0200 Subject: [PATCH] Fix Makefile and PKGBUILD for proper installation --- Makefile | 8 ++++---- PKGBUILD | 8 +------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index d479157..6724ab4 100644 --- a/Makefile +++ b/Makefile @@ -12,11 +12,11 @@ clean: -rm -f fetchy install: all - mkdir -p $(PREFIX)/bin - cp -f fetchy $(PREFIX)/bin - chmod 755 $(PREFIX)/bin/fetchy + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp -f fetchy $(DESTDIR)$(PREFIX)/bin + chmod 755 $(DESTDIR)$(PREFIX)/bin/fetchy uninstall: - -rm -f $(PREFIX)/bin/fetchy + -rm -f $(DESTDIR)$(PREFIX)/bin/fetchy .PHONY: all install uninstall clean diff --git a/PKGBUILD b/PKGBUILD index 7d06f56..b421209 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -27,15 +27,9 @@ validpgpkeys=() build() { cd fetchy make - } package() { cd fetchy - mkdir -p ${pkgdir}/opt/${pkgname} - cp -rf * ${pkgdir}/opt/${pkgname} - make install - + make DESTDIR="$pkgdir" PREFIX="/usr" install } - -