From ea340fa93649ce6a3bda915ec0dbae585db3df62 Mon Sep 17 00:00:00 2001
From: mike <mike>
Date: Mon, 4 Nov 2002 12:55:23 +0000
Subject: [PATCH] Add comment on needing the source directory to be on the
 CLASSPATH. Abstract out the name of the documentation
 directory.

---
 src/org/z3950/zing/cql/Makefile |   43 ++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/org/z3950/zing/cql/Makefile b/src/org/z3950/zing/cql/Makefile
index 41a310d..5b2ca73 100644
--- a/src/org/z3950/zing/cql/Makefile
+++ b/src/org/z3950/zing/cql/Makefile
@@ -1,4 +1,6 @@
-# $Id: Makefile,v 1.5 2002-11-03 17:02:48 mike Exp $
+# $Id: Makefile,v 1.6 2002-11-04 12:55:23 mike Exp $
+
+DOCDIR = ../../../../../docs
 
 OBJ = Utils.class \
 	CQLNode.class CQLTermNode.class CQLBooleanNode.class \
@@ -10,12 +12,22 @@ OBJ = Utils.class \
 ../../../../../lib/cql-java.jar: $(OBJ)
 	cd ../../../..; jar cf ../lib/cql-java.jar org/z3950/zing/cql/*.class
 
-docs: ../../../../../docs/overview-tree.html
+docs: $(DOCDIR)/overview-tree.html
 
-../../../../../docs/overview-tree.html: *.java
-	nice javadoc -d ../../../../../docs -author -version \
+$(DOCDIR)/overview-tree.html: *.java
+	nice javadoc -d $(DOCDIR) -author -version \
 		-windowtitle cql-java org.z3950.zing.cql
 
+# Your Java compiler will require that this source directory is on the
+# CLASSPATH.  You can either set your CLASSPATH environment variable
+# to include /where/ever/you/unpacked/it/cql-java-VERSION/src or try
+# changing the rule below to:
+#
+#	javac -classpath ../../../.. $<
+#
+# (But that will break if you need other elements in the CLASSPATH
+# too, for the Java library -- as, for example, Jikes does.)
+#
 %.class: %.java
 	javac $<
 
@@ -23,15 +35,14 @@ clean:
 	rm -f $(OBJ) 'CQLLexer$$Keyword.class'
 
 cleandocs:
-	rm -rf \
-		../../../../../docs/allclasses-frame.html \
-		../../../../../docs/deprecated-list.html \
-		../../../../../docs/help-doc.html \
-		../../../../../docs/index-all.html \
-		../../../../../docs/index.html \
-		../../../../../docs/org \
-		../../../../../docs/overview-tree.html \
-		../../../../../docs/package-list \
-		../../../../../docs/packages.html \
-		../../../../../docs/serialized-form.html \
-		../../../../../docs/stylesheet.css
+	rm -rf	$(DOCDIR)/allclasses-frame.html \
+		$(DOCDIR)/deprecated-list.html \
+		$(DOCDIR)/help-doc.html \
+		$(DOCDIR)/index-all.html \
+		$(DOCDIR)/index.html \
+		$(DOCDIR)/org \
+		$(DOCDIR)/overview-tree.html \
+		$(DOCDIR)/package-list \
+		$(DOCDIR)/packages.html \
+		$(DOCDIR)/serialized-form.html \
+		$(DOCDIR)/stylesheet.css
-- 
1.7.10.4