diff options
| author | Rene Engelhard <rene@debian.org> | 2011-05-31 13:20:57 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2011-05-31 13:21:25 +0200 |
| commit | dc71e30dfbac2713da80f4cc9c1f43b2cd5d47c6 (patch) | |
| tree | 213a9e8c14cf44a2d6795aaa7886bf7d06ea957f | |
| parent | f42d427a69383b84b83346a0fdeec324bf74f777 (diff) | |
fix build in connectivity/qa with system-hsqldblibreoffice-3-4-0
| -rwxr-xr-x | connectivity/qa/makefile.mk | 8 |
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) |