From a31ad988bd47285e08af4ba6b522979aa6afe275 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Sun, 2 Nov 2014 17:11:55 +0100
Subject: m
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 DEPENDENCIES | 17 ++++++++++++++++-
 Makefile     | 31 +++++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/DEPENDENCIES b/DEPENDENCIES
index a8a4c07..ae6a2cf 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,4 +1,5 @@
-RUNTIME:
+RUNTIME DEPENDENCIES:
+
 	gzip: decompress fonts
 	nafe: read font files
 	kbd: default font
@@ -8,4 +9,18 @@ RUNTIME:
 	awk
 	grep
 	sed
+	coreutils
+
+
+BUILD DEPENDENCIES:
+
+	make
+	coreutils
+	sed
+
+
+INSTALL DEPENDENCIES:
+
+	make
+	coreutils
 
diff --git a/Makefile b/Makefile
index 35ee7d3..3e2b1f2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@
 
 
 PREFIX = /usr
+KBD_PREFIX = $(PREFIX)
+ENV_PREFIX = $(PREFIX)
 BIN = /bin
 LIBEXEC = /libexec/$(PKGNAME)
 DATA = /share
@@ -15,12 +17,13 @@ DOCDIR = $(DATADIR)/doc
 INFODIR = $(DATADIR)/info
 LICENSEDIR = $(DATADIR)/licenses
 SYSCONFDIR = /etc
-PROCDIR = /proc
 DEVDIR = /dev
 TMPDIR = /tmp
 
 PKGNAME = splashtool
 
+PY_SHEBANG = $(ENV_PREFIX)$(BIN)/env python3
+
 
 
 .PHONY: default
@@ -30,7 +33,23 @@ default: command info
 all: command doc
 
 .PHONY: command
-command:
+command: bin/splashtool bin/assemble
+
+bin/splashtool: src/splashtool
+	@mkdir -p bin
+	cp $< $@
+	sed -i 's:/dev/:$(DEVDIR)/:g' $@
+	sed -i 's:/usr/share/kbd/:$(KBD_PREFIX)$(DATA)/kbd/:g' $@
+	sed -i 's:/tmp/:$(TMPDIR)/:g' $@
+
+bin/assemble: src/assemble
+	@mkdir -p bin
+	echo '#!$(PY_SHEBANG)' > $@
+	sed 1d < $< >> $@
+	sed -i 's:/dev/:$(DEVDIR)/:g' $@
+	sed -i 's:/usr/share/kbd/:$(KBD_PREFIX)$(DATA)/kbd/:g' $@
+	sed -i 's:/tmp/:$(TMPDIR)/:g' $@
+	chmod a+x $@
 
 .PHONY: doc
 doc: info pdf ps dvi
@@ -72,12 +91,12 @@ install-all: install-base install-doc
 install-base: install-command install-license
 
 .PHONY: install-command
-install-command:
+install-command: bin/assemble bin/splashtool
 	install -dm755 "$(DESTDIR)$(BINDIR)"
 	install -dm755 "$(DESTDIR)$(LIBEXECDIR)"
-	install -m755 src/assemble "$(DESTDIR)$(LIBEXECDIR)"/assemble
-	install -m755 src/splashtool "$(DESTDIR)$(LIBEXECDIR)"/splashtool
-	ln -sf "$(LIBEXECDIR)"/splashtool "$(DESTDIR)$(BINDIR)"/splashtool
+	install -m755 bin/assemble "$(DESTDIR)$(LIBEXECDIR)"/assemble
+	install -m755 bin/splashtool "$(DESTDIR)$(LIBEXECDIR)"/splashtool
+	ln -sfr "$(LIBEXECDIR)"/splashtool "$(DESTDIR)$(BINDIR)"/splashtool
 
 .PHONY: install-license
 install-license:
-- 
cgit v1.2.3-70-g09d2