summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-3-RC/files/patch-i103628
blob: c3846bc27ae28824e5394a21b0ff4bb82dbb7049 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
very strange workaround indeed.

--- qadevOOo/runner/makefile.mk	2009-07-04 12:13:19.000000000 +0900
+++ qadevOOo/runner/makefile.mk	2009-07-19 09:37:44.000000000 +0900
@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
 
 JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
 JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
+JAR=${JAVA_HOME}/bin/jar
 
 # --- Targets ------------------------------------------------------
 .IF "$(SOLAR_JAVA)"=="TRUE"
@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
 
 # LLA: parameter v is only verbose, need too long!
 OWNJAR: LIGHT
-    jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+    ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
 
 # LLA: parameter v is only verbose, need too long!
 LIGHT:
-    jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+    ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
 
 .ELSE
 all: