From 5703473fc06d8a92ec92d44fab5ddcf19938a1a6 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Mon, 1 Mar 2021 17:32:48 +0100
Subject: misc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 consolefont/COPYING      |  2 +-
 consolefont/DEPENDENCIES |  2 ++
 consolefont/Makefile     | 23 ++++++++++++++++-------
 3 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 consolefont/DEPENDENCIES

(limited to 'consolefont')

diff --git a/consolefont/COPYING b/consolefont/COPYING
index 93b0910..b693493 100644
--- a/consolefont/COPYING
+++ b/consolefont/COPYING
@@ -1,4 +1,4 @@
-This console font is based on lat9w-16 from kbd (www.kbd-project.org
+This console font is based on lat9w-16 from kbd (www.kbd-project.org)
 
 
 Copyright (C) 2013  Mattias Andrée (maandree@member.fsf.org)
diff --git a/consolefont/DEPENDENCIES b/consolefont/DEPENDENCIES
new file mode 100644
index 0000000..059bd88
--- /dev/null
+++ b/consolefont/DEPENDENCIES
@@ -0,0 +1,2 @@
+nafe: building psf file
+kbd:  converting psf to psfu
diff --git a/consolefont/Makefile b/consolefont/Makefile
index 128b2fe..7b7efef 100644
--- a/consolefont/Makefile
+++ b/consolefont/Makefile
@@ -1,4 +1,9 @@
-SHELL=bash
+.POSIX:
+
+PREFIX = /usr
+NAME   = maandree-16
+
+LAT9W_16_PATH = /usr/share/kbd/consolefonts/lat9w-16.psfu.gz
 
 all: maandree-16.psfu.gz
 
@@ -6,15 +11,19 @@ maandree-16.psf: maandree-16
 	txt2psf maandree-16 maandree-16.psf
 
 maandree-16.psfu: maandree-16.psf
-	psfaddtable maandree-16.psf <(psfgettable <(gunzip < /usr/share/kbd/consolefonts/lat9w-16.psfu.gz)) maandree-16.psfu
+	gunzip < $(LAT9W_16_PATH) | psfgettable - | psfaddtable maandree-16.psf - maandree-16.psfu
 
 maandree-16.psfu.gz: maandree-16.psfu
-	gzip maandree-16.psfu
+	gzip -9f < maandree-16.psfu > maandree-16.psfu.gz
 
 install:
-	maandree-16.psfu.gz /usr/share/kbd/consolefonts/maandree-16.psfu.gz
+	mkdir -p -- /usr/share/kbd/consolefonts/
+	cp -- maandree-16.psfu.gz "$(DESTDIR)$(PREFIX)/share/kbd/consolefonts/$(NAME).psfu.gz"
+
+uninstall:
+	-rm -f -- "$(DESTDIR)$(PREFIX)/share/kbd/consolefonts/$(NAME).psfu.gz"
 
-depends:
-	@echo 'nafe: building psf file'
-	@echo 'kbd:  converting psf to psfu'
+clean:
+	-rm -f -- maandree-16.psfu.gz maandree-16.psfu maandree-16.psf
 
+.PHONY: all install uninstall clean
-- 
cgit v1.2.3-70-g09d2