From 83b77c85d91231eba033f12fe16088aee6f4b276 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <m@maandree.se>
Date: Sun, 22 Feb 2026 14:37:56 +0100
Subject: m fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <m@maandree.se>
---
 Makefile | 63 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 9ff57c1..f607487 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,9 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
+.POSIX:
+
+
 PREFIX = /usr
 BIN = /bin
 DATA = /share
@@ -14,6 +17,13 @@ MANDIR = $(DATADIR)/man
 MAN1DIR = $(MANDIR)/man1
 LICENSEDIR = $(DATADIR)/licenses
 
+CC = c99
+
+CPPFLAGS =
+CFLAGS   =
+LDFLAGS  =
+
+
 PKGNAME = librarian
 COMMAND = librarian
 
@@ -21,12 +31,6 @@ COMMAND = librarian
 LIBRARIAN_PATH = /usr/local/share/librarian:/usr/share/librarian
 
 
-OPTIMISE = -O2
-WARN = -Wall -Wextra -pedantic
-FLAGS = -std=c99 $(WARN) $(OPTIMISE) -D'DEFAULT_PATH="$(LIBRARIAN_PATH)"'
-
-
-
 .PHONY: default
 default: base info shell
 
@@ -41,11 +45,11 @@ cmd: bin/librarian
 
 bin/librarian: obj/librarian.o
 	@mkdir -p bin
-	${CC} ${FLAGS} -o $@ $^ ${LDFLAGS}
+	$(CC) -o $@ obj/librarian.o $(LDFLAGS)
 
 obj/%.o: src/%.c src/*.h
 	mkdir -p obj
-	${CC} ${FLAGS} -c -o $@ ${CPPFLAGS} ${CFLAGS} $<
+	$(CC) -D'DEFAULT_PATH="$(LIBRARIAN_PATH)"' -c -o $@ $< $(CPPFLAGS) $(CFLAGS)
 
 .PHONY: doc
 doc: info pdf dvi ps
@@ -115,62 +119,62 @@ install-base: install-cmd install-copyright
 
 .PHONY: install-cmd
 install-cmd: bin/librarian
-	install -dm755 -- "$(DESTDIR)$(BINDIR)"
-	install -m755 $< -- "$(DESTDIR)$(BINDIR)/$(COMMAND)"
+	mkdir -p -- "$(DESTDIR)$(BINDIR)"
+	cp -- bin/librarian "$(DESTDIR)$(BINDIR)/$(COMMAND)"
 
 .PHONY: install-copyright
 install-copyright: install-license
 
 .PHONY: install-license
 install-license:
-	install -dm755 -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-	install -m644 LICENSE -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
+	mkdir -p -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
+	cp -- LICENSE "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
 
 .PHONY: install-doc
 install-doc: install-info install-pdf install-dvi install-ps install-man
 
 .PHONY: install-info
 install-info: bin/librarian.info
-	install -dm755 -- "$(DESTDIR)$(INFODIR)"
-	install -m644 $< -- "$(DESTDIR)$(INFODIR)/$(PKGNAME).info"
+	mkdir -p -- "$(DESTDIR)$(INFODIR)"
+	cp -- bin/librarian.info "$(DESTDIR)$(INFODIR)/$(PKGNAME).info"
 
 .PHONY: install-pdf
 install-pdf: bin/librarian.pdf
-	install -dm755 -- "$(DESTDIR)$(DOCDIR)"
-	install -m644 $< -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf"
+	mkdir -p -- "$(DESTDIR)$(DOCDIR)"
+	cp -- bin/librarian.pdf "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf"
 
 .PHONY: install-dvi
 install-dvi: bin/librarian.dvi
-	install -dm755 -- "$(DESTDIR)$(DOCDIR)"
-	install -m644 $< -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi"
+	mkdir -p -- "$(DESTDIR)$(DOCDIR)"
+	cp -- bin/librarian.dvi "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi"
 
 .PHONY: install-ps
 install-ps: bin/librarian.ps
-	install -dm755 -- "$(DESTDIR)$(DOCDIR)"
-	install -m644 $< -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps"
+	mkdir -p -- "$(DESTDIR)$(DOCDIR)"
+	cp -- bin/librarian.ps "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps"
 
 .PHONY: install-man
 install-man: doc/man/librarian.1
-	install -dm755 -- "$(DESTDIR)$(MAN1DIR)"
-	install -m644 $< -- "$(DESTDIR)$(MAN1DIR)/$(COMMAND).1"
+	mkdir -p -- "$(DESTDIR)$(MAN1DIR)"
+	cp -- doc/man/librarian.1 "$(DESTDIR)$(MAN1DIR)/$(COMMAND).1"
 
 .PHONY: install-shell
 install-shell: install-bash install-fish install-zsh
 
 .PHONY: install-bash
 install-bash: bin/librarian.bash-completion
-	install -dm755 -- "$(DESTDIR)$(DATADIR)/bash-completion/completions"
-	install -m644 $< -- "$(DESTDIR)$(DATADIR)/bash-completion/completions/$(COMMAND)"
+	mkdir -p -- "$(DESTDIR)$(DATADIR)/bash-completion/completions"
+	cp -- bin/librarian.bash-completion "$(DESTDIR)$(DATADIR)/bash-completion/completions/$(COMMAND)"
 
 .PHONY: install-fish
 install-fish: bin/librarian.fish-completion
-	install -dm755 -- "$(DESTDIR)$(DATADIR)/fish/completions"
-	install -m644 $< -- "$(DESTDIR)$(DATADIR)/fish/completions/$(COMMAND).fish"
+	mkdir -p -- "$(DESTDIR)$(DATADIR)/fish/completions"
+	cp -- bin/librarian.fish-completion "$(DESTDIR)$(DATADIR)/fish/completions/$(COMMAND).fish"
 
 .PHONY: install-zsh
 install-zsh: bin/librarian.zsh-completion
-	install -dm755 -- "$(DESTDIR)$(DATADIR)/zsh/site-functions"
-	install -m644 $< -- "$(DESTDIR)$(DATADIR)/zsh/site-functions/_$(COMMAND)"
+	mkdir -p -- "$(DESTDIR)$(DATADIR)/zsh/site-functions"
+	cp -- bin/librarian.zsh-completion "$(DESTDIR)$(DATADIR)/zsh/site-functions/_$(COMMAND)"
 
 
 
@@ -192,5 +196,4 @@ uninstall:
 
 .PHONY: clean
 clean:
-	-rm -r bin obj
-
+	-rm -rf -- bin obj
-- 
cgit v1.2.3-70-g09d2