From d9fe346ba6245bdebdc21720025edb21780ef9c4 Mon Sep 17 00:00:00 2001 From: Samuel de Oliveira <81493939+Samuel-de-Oliveira@users.noreply.github.com> Date: Sun, 3 Apr 2022 19:39:57 -0300 Subject: [PATCH] Add uninstall in Makefile --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 611b1c3..2d80f57 100644 --- Makefile +++ Makefile @@ -35,3 +35,9 @@ install: sudo cp ./$(TARGET) $(INSTALL_DIR) sudo mkdir -p /usr/local/man/man1 sudo cp ./doc/kabmat.1 /usr/local/man/man1/ + rm -rf $(BUILD_DIR) $(TARGET) + +.PHONY: uninstall +uninstall: + sudo rm -rf $(INSTALL_DIR)/$(TARGET) + sudo rm -rf /usr/local/man/man1/kabmat.1 From 522ff92bb3b0fa8ec4c0d137dee1eafc98abb5c3 Mon Sep 17 00:00:00 2001 From: Mae Dartmann Date: Mon, 4 Apr 2022 13:40:36 +0200 Subject: [PATCH] Makefile: implement DESTDIR, follow GNU conventions Signed-off-by: Mae Dartmann Changes to be committed: modified: Makefile --- Makefile | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2d80f57..4cb29b6 100644 --- Makefile +++ Makefile @@ -1,7 +1,18 @@ +# Common prefix for installation directories, following GNU conventions. +# See https://www.gnu.org/prep/standards/html_node/Directory-Variables.html for details. + +# Installation prefix +PREFIX = /usr/local +DATAROOTDIR = $(PREFIX)/share + +# Where to put the executable. +BINDIR = $(PREFIX)/bin +# Where to put the manual pages. +MANDIR = $(DATAROOTDIR)/man + TARGET = kabmat SRC_DIR = src BUILD_DIR = bin -INSTALL_DIR = /usr/bin/ DATA_DIR = ~/.local/share/kabmat CFLAGS = -std=c++17 -Wall -Wextra @@ -32,12 +43,12 @@ clean: .PHONY: install install: $(MAKE) - sudo cp ./$(TARGET) $(INSTALL_DIR) - sudo mkdir -p /usr/local/man/man1 - sudo cp ./doc/kabmat.1 /usr/local/man/man1/ + install -dm755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 + install -Dm755 ./$(TARGET) $(DESTDIR)$(BINDIR) + install -Dm644 ./doc/kabmat.1 $(DESTDIR)$(MANDIR)/man1 rm -rf $(BUILD_DIR) $(TARGET) .PHONY: uninstall uninstall: - sudo rm -rf $(INSTALL_DIR)/$(TARGET) - sudo rm -rf /usr/local/man/man1/kabmat.1 + rm $(DESTDIR)$(BINDIR)/$(TARGET) + rm $(DESTDIR)$(MANDIR)/man1/kabmat.1 From 493e625e64a3f0a732de124ad72aded90b1bfd61 Mon Sep 17 00:00:00 2001 From: PlankCipher Date: Tue, 5 Apr 2022 16:24:36 +0200 Subject: [PATCH] Separate building and installing in Makefile --- Makefile | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4cb29b6..3710181 100644 --- Makefile +++ Makefile @@ -42,11 +42,10 @@ clean: .PHONY: install install: - $(MAKE) install -dm755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 install -Dm755 ./$(TARGET) $(DESTDIR)$(BINDIR) install -Dm644 ./doc/kabmat.1 $(DESTDIR)$(MANDIR)/man1 - rm -rf $(BUILD_DIR) $(TARGET) + $(MAKE) clean .PHONY: uninstall uninstall: From 2e4169d675e018ff04835baf5b481884db7e85da Mon Sep 17 00:00:00 2001 From: Mae Dartmann Date: Wed, 20 Apr 2022 11:45:22 +0200 Subject: [PATCH] Makefile: fix install on non-GNU systems Signed-off-by: Mae Dartmann Changes to be committed: modified: Makefile --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3710181..4f796dd 100644 --- Makefile +++ Makefile @@ -42,9 +42,11 @@ clean: .PHONY: install install: - install -dm755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 - install -Dm755 ./$(TARGET) $(DESTDIR)$(BINDIR) - install -Dm644 ./doc/kabmat.1 $(DESTDIR)$(MANDIR)/man1 + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 + cp ./$(TARGET) $(DESTDIR)$(BINDIR) + chmod 0755 $(DESTDIR)$(BINDIR)/$(TARGET) + cp ./doc/kabmat.1 $(DESTDIR)$(MANDIR)/man1 + chmod 0644 $(DESTDIR)$(MANDIR)/man1/kabmat.1 $(MAKE) clean .PHONY: uninstall