From d2adac897737ee1824be0a3b7ed09ec65ff4c1c9 Mon Sep 17 00:00:00 2001 From: Darks Date: Sat, 6 Mar 2021 13:00:01 +0100 Subject: [PATCH 1/3] Add support for DESTDIR --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b18d6ec..a788929 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,13 @@ PREFIX ?= $(HOME)/.local -VERSION = 1.0 +DESTDIR ?= $(PREFIX) +VERSION = 1.1 install: $(bin) - install -d $(PREFIX)/bin - sed -e 's*%PREFIX%*$(PREFIX)*; s*%VERSION%*$(VERSION)*' giteapc.py > $(PREFIX)/bin/giteapc - chmod +x $(PREFIX)/bin/giteapc - install -d $(PREFIX)/lib/giteapc/giteapc - install giteapc/*.py $(PREFIX)/lib/giteapc/giteapc + install -d $(DESTDIR)/bin + sed -e 's*%PREFIX%*$(PREFIX)*; s*%VERSION%*$(VERSION)*' giteapc.py > $(DESTDIR)/bin/giteapc + chmod +x $(DESTDIR)/bin/giteapc + install -d $(DESTDIR)/lib/giteapc/giteapc + install giteapc/*.py $(DESTDIR)/lib/giteapc/giteapc uninstall: rm -f $(PREFIX)/bin/giteapc -- 2.45.0 From 28528f1778008baacaa4cf16bf1c1f5f5c9bbba7 Mon Sep 17 00:00:00 2001 From: Darks Date: Sat, 6 Mar 2021 13:46:19 +0100 Subject: [PATCH 2/3] Updated to GNU recommendations https://www.gnu.org/software/make/manual/html_node/DESTDIR.html --- Makefile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index a788929..15dc596 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,22 @@ PREFIX ?= $(HOME)/.local -DESTDIR ?= $(PREFIX) +DESTDIR ?= "" VERSION = 1.1 +bindir = $(PREFIX)/bin +libdir = $(PREFIX)/lib +sharedir = $(PREFIX)/share + install: $(bin) - install -d $(DESTDIR)/bin - sed -e 's*%PREFIX%*$(PREFIX)*; s*%VERSION%*$(VERSION)*' giteapc.py > $(DESTDIR)/bin/giteapc - chmod +x $(DESTDIR)/bin/giteapc - install -d $(DESTDIR)/lib/giteapc/giteapc - install giteapc/*.py $(DESTDIR)/lib/giteapc/giteapc + install -d $(DESTDIR)$(bindir) + sed -e 's*%PREFIX%*$(PREFIX)*; s*%VERSION%*$(VERSION)*' giteapc.py > $(DESTDIR)$(bindir)/giteapc + chmod +x $(DESTDIR)$(bindir)/giteapc + install -d $(DESTDIR)$(libdir)/giteapc/giteapc + install giteapc/*.py $(DESTDIR)$(libdir)/giteapc/giteapc uninstall: - rm -f $(PREFIX)/bin/giteapc - rm -rf $(PREFIX)/lib/giteapc - rmdir $(PREFIX)/share/giteapc 2>/dev/null || true + rm -f $(PREFIX)$(bindir)/giteapc + rm -rf $(PREFIX)$(libdir)/giteapc + rmdir $(PREFIX)$(sharedir)/giteapc 2>/dev/null || true @ echo "note: repositories cloned by GiteaPC have not been removed" .PHONY: install uninstall -- 2.45.0 From d11de45e5159d80beb5321bc68d2b436251962c9 Mon Sep 17 00:00:00 2001 From: Darks Date: Sat, 6 Mar 2021 13:52:44 +0100 Subject: [PATCH 3/3] Simplified a lot --- Makefile | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 15dc596..74530da 100644 --- a/Makefile +++ b/Makefile @@ -2,21 +2,17 @@ PREFIX ?= $(HOME)/.local DESTDIR ?= "" VERSION = 1.1 -bindir = $(PREFIX)/bin -libdir = $(PREFIX)/lib -sharedir = $(PREFIX)/share - install: $(bin) - install -d $(DESTDIR)$(bindir) - sed -e 's*%PREFIX%*$(PREFIX)*; s*%VERSION%*$(VERSION)*' giteapc.py > $(DESTDIR)$(bindir)/giteapc - chmod +x $(DESTDIR)$(bindir)/giteapc - install -d $(DESTDIR)$(libdir)/giteapc/giteapc - install giteapc/*.py $(DESTDIR)$(libdir)/giteapc/giteapc + install -d $(DESTDIR)$(PREFIX)/bin + sed -e 's*%PREFIX%*$(PREFIX)*; s*%VERSION%*$(VERSION)*' giteapc.py > $(DESTDIR)$(PREFIX)/bin/giteapc + chmod +x $(DESTDIR)$(PREFIX)/bin/giteapc + install -d $(DESTDIR)$(PREFIX)/lib/giteapc/giteapc + install giteapc/*.py $(DESTDIR)$(PREFIX)/lib/giteapc/giteapc uninstall: - rm -f $(PREFIX)$(bindir)/giteapc - rm -rf $(PREFIX)$(libdir)/giteapc - rmdir $(PREFIX)$(sharedir)/giteapc 2>/dev/null || true + rm -f $(PREFIX)/bin/giteapc + rm -rf $(PREFIX)/lib/giteapc + rmdir $(PREFIX)/share/giteapc 2>/dev/null || true @ echo "note: repositories cloned by GiteaPC have not been removed" .PHONY: install uninstall -- 2.45.0