diff options
author | root <root@rshg047.dnsready.net> | 2011-05-31 22:46:59 +0000 |
---|---|---|
committer | root <root@rshg047.dnsready.net> | 2011-05-31 22:46:59 +0000 |
commit | c40a217db5f63be3aa88a32ad77ec93efb40d95c (patch) | |
tree | bb98d36456ecf48105be6f0bd57c480eb8f32619 /testing/libreoffice/buildfix_i116795.diff | |
parent | a422536e1ba326bff507ba81859c784a135d1804 (diff) |
Tue May 31 22:46:59 UTC 2011
Diffstat (limited to 'testing/libreoffice/buildfix_i116795.diff')
-rw-r--r-- | testing/libreoffice/buildfix_i116795.diff | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/testing/libreoffice/buildfix_i116795.diff b/testing/libreoffice/buildfix_i116795.diff new file mode 100644 index 000000000..8601bc164 --- /dev/null +++ b/testing/libreoffice/buildfix_i116795.diff @@ -0,0 +1,22 @@ +diff -r 4ab9e11cb892 connectivity/qa/makefile.mk +--- a/connectivity/qa/makefile.mk Thu Mar 03 15:22:23 2011 +0100 ++++ b/connectivity/qa/makefile.mk Fri Mar 04 09:51:48 2011 +0100 +@@ -35,9 +35,16 @@ + + #----- compile .java files ----------------------------------------- + +-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar + JAVAFILES := $(shell @$(FIND) complex -name "*.java") + ++JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ++ ++.IF "$(SYSTEM_HSQLDB)" == "YES" ++EXTRAJARFILES = $(HSQLDB_JAR) ++.ELSE ++JARFILES += hsqldb.jar ++.ENDIF ++ + #----- make a jar from compiled files ------------------------------ + + JARCLASSDIRS = $(PACKAGE) + |