66b79a1c1f
3.4.2-rc3 is final; added few extra fixes; fixed build on Factory again OBS-URL: https://build.opensuse.org/request/show/82215 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=21
23 lines
961 B
Diff
23 lines
961 B
Diff
--- scripting/util/provider/javascript/makefile.mk.old 2011-05-19 12:27:42.000000000 +0200
|
|
+++ scripting/util/provider/javascript/makefile.mk 2011-09-14 18:50:45.000000000 +0200
|
|
@@ -36,7 +36,7 @@ EXTENSIONNAME:=ScriptProviderForJavaScri
|
|
EXTENSION_ZIPNAME:=script-provider-for-javascript
|
|
|
|
COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
|
|
-EXTENSION_PACKDEPS=$(SOLARBINDIR)$/js.jar
|
|
+EXTENSION_PACKDEPS=$(EXTENSIONDIR)$/js.jar
|
|
|
|
.IF "$(ENABLE_SCRIPTING_JAVASCRIPT)" != "YES"
|
|
@all:
|
|
--- scripting/util/provider/beanshell/makefile.mk.old 2011-05-24 14:21:08.000000000 +0200
|
|
+++ scripting/util/provider/beanshell/makefile.mk 2011-09-14 18:50:04.000000000 +0200
|
|
@@ -37,7 +37,7 @@ EXTENSION_ZIPNAME:=script-provider-for-b
|
|
|
|
COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
|
|
.IF "$(SYSTEM_BSH)" != "YES"
|
|
-EXTENSION_PACKDEPS=$(SOLARBINDIR)$/bsh.jar
|
|
+EXTENSION_PACKDEPS=$(EXTENSIONDIR)$/bsh.jar
|
|
.ENDIF
|
|
|
|
.IF "$(ENABLE_SCRIPTING_BEANSHELL)" != "YES"
|