From ce1e7a2fe5c26f04ce6ffd48eb14c1c56260ad4b Mon Sep 17 00:00:00 2001
From: Matthew Slowe <foo@mafoo.org.uk>
Date: Sun, 5 Apr 2020 13:25:37 +0100
Subject: [PATCH] fix makefile

---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index dd48106..e970aa1 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ SRCS = uk/org/mafoo/wordsearch/CouldNotPlaceWordException.java \
        uk/org/mafoo/wordsearch/DistributedRandomNumberGenerator.java \
        uk/org/mafoo/wordsearch/Direction.java
 
-JSPS = $(wildcard war/*.jsp war/*.css)
+JSPS = $(wildcard war/*.jsp war/*.css war/WEB-INF/jspf/*.jspf)
 
 OBJS = ${SRCS:.java=.class}
 
@@ -27,6 +27,8 @@ clean:
 wordsearch.jar: $(OBJS)
 	jar cf $@ $(OBJS)
 
-wordsearch.war: wordsearch.jar
-	cp -f wordsearch.jar war/lib
-	jar -c -f $@ -C war .
\ No newline at end of file
+war/WEB-INF/lib/wordsearch.jar: wordsearch.jar
+	cp $< $@
+
+wordsearch.war: war/WEB-INF/lib/wordsearch.jar  $(JSPS)
+	jar -cvf $@ -C war .
\ No newline at end of file