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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 77b6f38..9b4f425 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,9 @@ DATA = /share
 DATADIR = $(PREFIX)$(DATA)
 DOCDIR = $(DATADIR)/doc
 INFODIR = $(DATADIR)/info
+
+TEXI2DVI = texi2dvi
+
 LICENSEDIR = $(DATADIR)/licenses
 
 PKGNAME = cerberus-securetty
@@ -33,21 +36,21 @@ info: cerberus-securetty.info
 pdf: cerberus-securetty.pdf
 %.pdf: info/%.texinfo info/fdl.texinfo
 	@mkdir -p obj/pdf
-	cd obj/pdf ; yes X | texi2pdf ../../$<
+	cd obj/pdf && texi2pdf ../../$< < /dev/null
 	mv obj/pdf/$@ $@
 
 .PHONY: dvi
 dvi: cerberus-securetty.dvi
 %.dvi: info/%.texinfo info/fdl.texinfo
 	@mkdir -p obj/dvi
-	cd obj/dvi ; yes X | $(TEXI2DVI) ../../$<
+	cd obj/dvi && $(TEXI2DVI) ../../$< < /dev/null
 	mv obj/dvi/$@ $@
 
 .PHONY: ps
 ps: cerberus-securetty.ps
 %.ps: info/%.texinfo info/fdl.texinfo
 	@mkdir -p obj/ps
-	cd obj/ps ; yes X | texi2pdf --ps ../../$<
+	cd obj/ps && texi2pdf --ps ../../$< < /dev/null
 	mv obj/ps/$@ $@
 
 
@@ -62,36 +65,36 @@ install-base: install-securetty install-license
 
 .PHONY: install-securetty
 install-securetty:
-	install -dm755 -- "$(DESTDIR)$(DATADIR)/$(PKGNAME)"
-	install -m755 -- src/securetty "$(DESTDIR)$(DATADIR)/$(PKGNAME)/securetty"
+	mkdir -p -- "$(DESTDIR)$(DATADIR)/$(PKGNAME)"
+	cp -- src/securetty "$(DESTDIR)$(DATADIR)/$(PKGNAME)/securetty"
 
 .PHONY: install-license
 install-license:
-	install -dm755 -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-	install -m644 -- COPYING LICENSE "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
+	mkdir -p -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
+	cp -- COPYING LICENSE "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
 
 .PHONY: install-doc
 install-doc: install-info install-pdf install-ps install-dvi
 
 .PHONY: install-info
 install-info: cerberus-securetty.info
-	install -dm755 -- "$(DESTDIR)$(INFODIR)"
-	install -m644 -- "$<" "$(DESTDIR)$(INFODIR)/$(PKGNAME).info"
+	mkdir -p -- "$(DESTDIR)$(INFODIR)"
+	cp -- cerberus-securetty.info "$(DESTDIR)$(INFODIR)/$(PKGNAME).info"
 
 .PHONY: install-pdf
 install-pdf: cerberus-securetty.pdf
-	install -dm755 -- "$(DESTDIR)$(DOCDIR)"
-	install -m644 -- "$<" "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf"
+	mkdir -p -- "$(DESTDIR)$(DOCDIR)"
+	cp -- cerberus-securetty.pdf "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf"
 
 .PHONY: install-ps
 install-ps: cerberus-securetty.ps
-	install -dm755 -- "$(DESTDIR)$(DOCDIR)"
-	install -m644 -- "$<" "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps"
+	mkdir -p -- "$(DESTDIR)$(DOCDIR)"
+	cp -- cerberus-securetty.ps "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps"
 
 .PHONY: install-dvi
 install-dvi: cerberus-securetty.dvi
-	install -dm755 -- "$(DESTDIR)$(DOCDIR)"
-	install -m644 -- "$<" "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi"
+	mkdir -p -- "$(DESTDIR)$(DOCDIR)"
+	cp -- cerberus-securetty.dvi "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi"
 
 
 .PHONY: uninstall
@@ -101,7 +104,7 @@ uninstall:
 	-rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/COPYING"
 	-rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE"
 	-rmdir -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-	-rmdir -- "$(DESTDIR)$(PREFIX)$(LICENSES)/$(PKGNAME)"
+	-rmdir -- "$(DESTDIR)$(LICENSEDIR)"
 	-rm -- "$(DESTDIR)$(INFODIR)/$(PKGNAME).info"
 	-rm -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf"
 	-rm -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps"
@@ -110,5 +113,5 @@ uninstall:
 
 .PHONY: clean
 clean:
-	-rm -r bin obj *.su src/*.su cerberus-securetty.{info,pdf,ps,dvi}
-
+	-rm -fr -- bin obj *.su src/*.su
+	-rm -f -- cerberus-securetty.info cerberus-securetty.pdf cerberus-securetty.ps cerberus-securetty.dvi
-- 
cgit v1.2.3-70-g09d2