diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-04 22:48:12 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-04 22:48:12 +0000 |
| commit | 80ba845c7cb571644d9dea61b9872c393d128c37 (patch) | |
| tree | 064ee49a661ab3bdfaef029661561fd60bd1354c /staging/libreoffice/buildfix_i116795.diff | |
| parent | 805d577f46f94e747f712b7c942f595cd8f7e170 (diff) | |
Sat Jun 4 22:48:12 UTC 2011
Diffstat (limited to 'staging/libreoffice/buildfix_i116795.diff')
| -rw-r--r-- | staging/libreoffice/buildfix_i116795.diff | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/staging/libreoffice/buildfix_i116795.diff b/staging/libreoffice/buildfix_i116795.diff new file mode 100644 index 000000000..8601bc164 --- /dev/null +++ b/staging/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) + |