summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2011-05-31 13:20:57 +0200
committerRene Engelhard <rene@debian.org>2011-05-31 13:20:57 +0200
commitd05d6223b5d21ee1ac02219485d45374e794c814 (patch)
tree51d6a0de7ce27afbb9dab1a224dff3a11c6d1559
parent9b3fb3b00d4ee80c40f62988f4d22b470a833cbf (diff)
fix build in connectivity/qa with system-hsqldb
-rwxr-xr-xconnectivity/qa/makefile.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
index ee41cab635..4dc2ee3633 100755
--- a/connectivity/qa/makefile.mk
+++ b/connectivity/qa/makefile.mk
@@ -35,9 +35,15 @@ PACKAGE = complex/connectivity
#----- compile .java files -----------------------------------------
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
JAVAFILES := $(shell @$(FIND) complex -name "*.java")
+.IF "$(SYSTEM_HSQLDB)" == "YES"
+XCLASSPATH:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
+.ELSE
+JARFILES+= hsqldb.jar
+.ENDIF
+
#----- make a jar from compiled files ------------------------------
JARCLASSDIRS = $(PACKAGE)