From f6aac60aee89eafcb088337d7f820766a657d5c1 Mon Sep 17 00:00:00 2001 From: emma Date: Thu, 25 Apr 2024 12:40:20 -0600 Subject: [PATCH 1/2] Makefile: fixed manpage install location --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 68efd20..e0068dc 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,8 @@ DESTDIR ?= dist PREFIX ?= /usr/local +MANDIR != [ $(PREFIX) = / ] && printf '/usr/share/man\n' \ + || printf '/share/man\n' SYSEXITS != printf '\043include \n' | cpp -M - | sed 's/ /\n/g' \ | sed -n 's/sysexits\.h//p' || printf 'include\n' @@ -42,7 +44,7 @@ clean: dist: all mkdir -p $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(PREFIX)/share/man/man1 cp build/bin/* $(DESTDIR)/$(PREFIX)/bin - cp docs/*.1 $(DESTDIR)/$(PREFIX)/share/man/man1 + cp docs/*.1 $(DESTDIR)/$(PREFIX)/$(MANDIR)/man1 .PHONY: install install: dist From d8b54fdbf5b1e19810c28a341c59d0ec4fec01ec Mon Sep 17 00:00:00 2001 From: emma Date: Thu, 25 Apr 2024 12:43:31 -0600 Subject: [PATCH 2/2] Makefile: fixes erroneous whitespace --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index e0068dc..1952a25 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,6 @@ mm: build/bin/mm build/bin/mm: src/mm.c build $(CC) $(CFLAGS) -o $@ src/mm.c - .PHONY: npc npc: build/bin/npc build/bin/npc: src/npc.c build