From: Mike Taylor <mike@miketaylor.org.uk>
Date: Wed, 19 May 2010 22:18:22 +0000 (+0100)
Subject: Adjust paths in Makefile to allow for maven compification.
X-Git-Tag: v1.5~20
X-Git-Url: http://git.indexdata.com/?p=cql-java-moved-to-github.git;a=commitdiff_plain;h=8e3c6c8a4977f2f1030a86052c765e8b39d9c304

Adjust paths in Makefile to allow for maven compification.
---

diff --git a/src/main/java/org/z3950/zing/cql/Makefile b/src/main/java/org/z3950/zing/cql/Makefile
index 39c4f21..00b82d5 100644
--- a/src/main/java/org/z3950/zing/cql/Makefile
+++ b/src/main/java/org/z3950/zing/cql/Makefile
@@ -19,15 +19,15 @@ OBJ = Utils.class \
 	UnknownRelationModifierException.class UnknownPositionException.class
 
 JARPATH = ../lib/cql-java.jar
-JAR = ../../../../$(JARPATH)
+JAR = ../../../../../../$(JARPATH)
 $(JAR): $(OBJ)
-	cd ../../../..; jar cf $(JARPATH) org/z3950/zing/cql/*.class
+	cd ../../../../../..; jar cf $(JARPATH) main/java/org/z3950/zing/cql/*.class
 
 %.class: %.java
 	javac -Xlint:unchecked *.java
 
 test: $(JAR)
-	cd ../../../../../test/regression && make
+	cd ../../../../../../../test/regression && make
 
 clean:
 	rm -f $(OBJ) 'CQLLexer$$Keyword.class'