From 5593186c998c3f63c7abadd3eaa97e55004fc182 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <m@maandree.se>
Date: Sun, 22 Feb 2026 13:50:59 +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 | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index aa21c1e..1930b77 100644
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,20 @@ SSH = ssh
 
 SH = bash
 SH_SHEBANG = /usr/bin/env $(SH)
-ECHO = /usr/bin/echo
 
-EXAMPLES = README lower-left-ponysay allow-uppercase issue-file   \
-           commands no-empty-user baudrate cerberus hide-username \
-           readline revoke-access loadkeys
+EXAMPLES =\
+	allow-uppercase\
+	baudrate\
+	cerberus\
+	commands\
+	hide-username\
+	issue-file\
+	loadkeys\
+	lower-left-ponysay\
+	no-empty-user\
+	readline\
+	revoke-access\
+	README
 
 
 
@@ -84,7 +93,6 @@ got.install: got
 	sed -i 's:@etc@:$(SYSCONF):g' "$@"
 	sed -i 's:@command@:$(COMMAND):g' "$@"
 	sed -i 's:@ssh@:$(SSH):g' "$@"
-	sed -i 's:@echo@:$(ECHO):g' "$@"
 
 
 
@@ -99,33 +107,38 @@ install-cmd: install-core install-examples
 
 .PHONY: install-core
 install-core: got.install
-	install -Dm755 -- "got.install"     "$(DESTDIR)$(PREFIX)$(SBIN)/got"
-	install -d     --                   "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
-	install  -m644 -- COPYING LICENSE   "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
+	mkdir -p -- "$(DESTDIR)$(PREFIX)$(SBIN)/"
+	cp -- got.install "$(DESTDIR)$(PREFIX)$(SBIN)/got"
+	mkdir -p -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)/"
+	cp -- COPYING LICENSE "$(DESTDIR)$(LICENSES)/$(PKGNAME)/"
 
 .PHONY: install-examples
 install-examples: $(foreach EXAMPLE, $(EXAMPLES), gotrc-examples/$(EXAMPLE))
-	install -d     --    "$(DESTDIR)$(SYSCONF)/gotrc.examples"
-	install  -m644 -- $^ "$(DESTDIR)$(SYSCONF)/gotrc.examples"
+	mkdir -p -- "$(DESTDIR)$(SYSCONF)/gotrc.examples"
+	cp -- $(foreach EXAMPLE, $(EXAMPLES), gotrc-examples/$(EXAMPLE)) "$(DESTDIR)$(SYSCONF)/gotrc.examples"
 
 .PHONY: install-doc
 install-doc: install-info install-pdf install-ps install-dvi
 
 .PHONY: install-info
 install-info: gates-of-tartaros.info
-	install -Dm644 -- "$<" "$(DESTDIR)$(DATA)/info/$(PKGNAME).info"
+	mkdir -p -- "$(DESTDIR)$(DATA)/info/"
+	cp -- gates-of-tartaros.info "$(DESTDIR)$(DATA)/info/$(PKGNAME).info"
 
 .PHONY: install-pdf
 install-pdf: gates-of-tartaros.pdf
-	install -Dm644 -- "$<" "$(DESTDIR)$(DATA)/doc/$(PKGNAME).pdf"
+	mkdir -p -- "$(DESTDIR)$(DATA)/doc/"
+	cp -- gates-of-tartaros.pdf "$(DESTDIR)$(DATA)/doc/$(PKGNAME).pdf"
 
 .PHONY: install-ps
 install-ps: gates-of-tartaros.ps
-	install -Dm644 -- "$<" "$(DESTDIR)$(DATA)/doc/$(PKGNAME).ps"
+	mkdir -p -- "$(DESTDIR)$(DATA)/doc/"
+	cp -- gates-of-tartaros.ps "$(DESTDIR)$(DATA)/doc/$(PKGNAME).ps"
 
 .PHONY: install-dvi
 install-dvi: gates-of-tartaros.dvi
-	install -Dm644 -- "$<" "$(DESTDIR)$(DATA)/doc/$(PKGNAME).dvi"
+	mkdir -p -- "$(DESTDIR)$(DATA)/doc/"
+	cp -- gates-of-tartaros.dvi "$(DESTDIR)$(DATA)/doc/$(PKGNAME).dvi"
 
 
 
@@ -135,7 +148,7 @@ uninstall:
 	-rm -r -- "$(DESTDIR)$(SYSCONF)/gotrc.examples"
 	-rm -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)/COPYING"
 	-rm -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)/LICENSE"
-	-rm -d -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
+	-rmdir -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
 	-rm -- "$(DESTDIR)$(DATA)/info/$(PKGNAME).info"
 	-rm -- "$(DESTDIR)$(DATA)/doc/$(PKGNAME).pdf"
 	-rm -- "$(DESTDIR)$(DATA)/doc/$(PKGNAME).ps"
@@ -145,5 +158,4 @@ uninstall:
 
 .PHONY: clean
 clean:
-	-rm -fr *.install *.{info,pdf,ps,dvi} obj
-
+	-rm -fr -- *.install *.info *.pdf *.ps *.dvi obj
-- 
cgit v1.2.3-70-g09d2