summaryrefslogtreecommitdiff
path: root/connectivity
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
commitae0eaa57ba2cef0313f853d19a9a13629bcd07cb (patch)
treed62e03c90d00abe3746f78d0fb61e6e57a9b5b68 /connectivity
parentf7afe79010ef13a3ae288e5b09122f1e5db64879 (diff)
fix build in connectivity/qa with system-hsqldb
Diffstat (limited to 'connectivity')
-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 ee41cab63554..4dc2ee363389 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)