From 6d75b3a234eae412eda753c0d03df0688b0737c3 Mon Sep 17 00:00:00 2001
From: Chris Novakovic <c.novakovic@cs.bham.ac.uk>
Date: Tue, 14 Aug 2018 16:45:40 +0100
Subject: [PATCH] prism/Makefile: parameterise hardcoded directory names

In the "binary" target, parameterise the following directory names to
match the style used in other targets:

    classes -> CLASSES_DIR
    dtds -> DTDS_DIR (new variable)
    images -> IMAGES_DIR (new variable)
    lib -> LIB_DIR
    src -> SRC_DIR
---
 prism/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/prism/Makefile b/prism/Makefile
index 0e36fcc8..e8564a93 100644
--- a/prism/Makefile
+++ b/prism/Makefile
@@ -282,6 +282,8 @@ CLASSES_DIR =	classes
 OBJ_DIR =		obj
 LIB_DIR =		lib
 INCLUDE_DIR =	include
+IMAGES_DIR =    images
+DTDS_DIR =      dtds
 
 # Now we locate the JNI header files jni.h and jni_md.h
 # (in fact this is the only reason we need JAVA_DIR)
@@ -536,7 +538,7 @@ dist_tidy:
 
 binary:
 	@echo Generating jar file...
-	@jar cmf src/manifest.txt lib/prism.jar -C classes . -C . images dtds
+	@jar cmf $(SRC_DIR)/manifest.txt $(LIB_DIR)/prism.jar -C $(CLASSES_DIR) . -C . $(IMAGES_DIR) $(DTDS_DIR)
 
 undist:
 	@rm -rf cudd && ln -s ../cudd cudd