From 3df3a511b52b74cb159e43f692ce839dec1ea3d7 Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.name>
Date: Thu, 10 Apr 2014 16:41:29 -0400
Subject: Improve Makefile to be more explicit and correct, and work properly
 with pmake

---
 Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e2c2b62..8b6d8fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,16 @@
 PREFIX = /usr
 
+.SUFFIXES: .htm .jargon .sed .dict .dz
+
 SRC = 1.htm 2.htm 3.htm 4.htm 5.htm \
       6.htm 7.htm 8.htm 9.htm 10.htm
 JARGONS = $(SRC:.htm=.jargon)
 
+all: oed.jargon oed.dict.dz
+
 $(JARGONS): htmtojargon.awk removeetags.pl symbols.sed \
             xmlcleanup.sed xmlcleanup2.sed
 
-all: oed.jargon oed.dict.dz
-
 .htm.jargon:
 	iconv -f ISO-8859-1 -t UTF-8 < "$<" \
 	| sed 's/\r//g' \
@@ -26,7 +28,7 @@ oed.jargon: $(JARGONS)
 	cat $(JARGONS) > $@
 
 oed.dict: oed.jargon
-	cat $< \
+	cat oed.jargon \
 	| dictfmt -j --utf8 \
 	  --columns 0 --headword-separator ',' \
 	  --index-data-separator "	" \
@@ -35,7 +37,7 @@ oed.dict: oed.jargon
 	  oed
 
 oed.dict.dz: oed.dict
-	dictzip -k $<
+	dictzip -k oed.dict
 
 install: all
 	chmod 644 oed.dict.dz oed.index
@@ -43,5 +45,4 @@ install: all
 	test -x /usr/sbin/dictdconfig && dictdconfig -w
 	test -x /etc/init.d/dictd && /etc/init.d/dictd restart
 
-.SUFFIXES: .htm .jargon .sed .dict .dz
 .PHONY: all install
-- 
cgit v1.2.3