diff -u config_office.orig/configure.in config_office/configure.in
--- openoffice.org.orig/config_office/configure.in	2006-05-26 09:21:32.000000000 +0100
+++ openoffice.org/config_office/configure.in	2006-05-26 09:54:44.000000000 +0100
@@ -102,6 +102,9 @@
 [  --enable-evolution2     Allows the built-in evolution 2 addressbook connectivity
 			  build to be enabled.
 ],,)
+AC_ARG_WITH(system-ure,
+[  --with-system-ure       use openoffice.org-ure already on system
+],,)
 AC_ARG_WITH(system-stdlibs,
 [  --with-system-stdlibs   use libstdc++/libgcc_s already on system
 ],,checkforprelink=yes)
@@ -2579,6 +2582,31 @@
 fi
 
 dnl ===================================================================
+dnl Check for system ure
+dnl ===================================================================
+AC_MSG_CHECKING([whether to use preinstalled ure])
+if test -n "$with_system_ure" && test "$with_system_ure" != "no"; then
+   AC_MSG_RESULT([yes])
+   PKG_CHECK_MODULES( URE, openoffice.org-ure )
+   URE_BINDIR=`$PKG_CONFIG --variable=ooobindir openoffice.org-ure`
+   URE_LIBDIR=`$PKG_CONFIG --variable=ooolibdir openoffice.org-ure`
+   URE_IDLDIR=`$PKG_CONFIG --variable=oooidldir openoffice.org-ure`
+   URE_RDBDIR=`$PKG_CONFIG --variable=ooordbdir openoffice.org-ure`
+   URE_JAVADIR=`$PKG_CONFIG --variable=ooojavadir openoffice.org-ure`
+   SYSTEM_URE=YES
+else
+   AC_MSG_RESULT([no])
+   SYSTEM_URE=NO
+fi
+AC_SUBST(SYSTEM_URE)
+AC_SUBST(URE_CFLAGS)
+AC_SUBST(URE_BINDIR)
+AC_SUBST(URE_JAVADIR)
+AC_SUBST(URE_LIBDIR)
+AC_SUBST(URE_IDLDIR)
+AC_SUBST(URE_RDBDIR)
+
+dnl ===================================================================
 dnl Check for system stdlibs
 dnl ===================================================================
 AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset])
diff -u config_office.orig/set_soenv.in config_office/set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in	2006-05-26 09:21:32.000000000 +0100
+++ openoffice.org/config_office/set_soenv.in	2006-05-26 09:57:55.000000000 +0100
@@ -1343,6 +1343,14 @@
 {  AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
 }
 
+if ( "@SYSTEM_URE@" eq "YES" )
+{
+    $PATH	.= $ps."@URE_BINDIR@";
+    $SOLARLIB	.= " -L@URE_LIBDIR@";
+    $SOLARINC	.= " @URE_CFLAGS@";
+    $LD_LIBRARY_PATH .= $ps."@URE_LIBDIR@";
+}
+
 if ($SYSTEM_PYTHON eq "NO")
 {
 	$PYTHONPATH           = '.'.$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$ds.'lib'.$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$ds.'lib'.$ds.'pyuno'.$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$ds.'bin'.$ds.'pyuno';
@@ -1722,6 +1730,12 @@
 ToFile( "EPM",               "@EPM@",              "e" );
 ToFile( "BUILD_EPM",         "@BUILD_EPM@",        "e" );
 ToFile( "PKGFORMAT",         "@PKGFORMAT@",        "e" );
+ToFile( "SYSTEM_URE",        "@SYSTEM_URE@",       "e" );
+ToFile( "URE_LIBDIR",        "@URE_LIBDIR@",       "e" );
+ToFile( "URE_IDLDIR",        "@URE_IDLDIR@",       "e" );
+ToFile( "URE_RDBDIR",        "@URE_RDBDIR@",       "e" );
+ToFile( "URE_BINDIR",        "@URE_BINDIR@",       "e" );
+ToFile( "URE_JAVADIR",       "@URE_JAVADIR@",      "e" );
 ToFile( "SYSTEM_STDLIBS",    "@SYSTEM_STDLIBS@",   "e" );
 ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
 ToFile( "SYSTEM_PYTHON",     "@SYSTEM_PYTHON@",    "e" );
Index: examples/java/build.xml
===================================================================
RCS file: /cvs/framework/scripting/examples/java/build.xml,v
retrieving revision 1.13
diff -u -r1.13 build.xml
--- openoffice.org.orig/scripting/examples/java/build.xml	9 Sep 2005 01:53:51 -0000	1.13
+++ openoffice.org/scripting/examples/java/build.xml	26 May 2006 13:33:49 -0000
@@ -37,14 +37,15 @@
 
   <property name="prj" value="../.."/>
   <property environment="env"/>
+  <property name="env.URE_JAVADIR" value="${solar.jar}"/>
   <property name="outdir" value="${out}/class/examples/java"/>
 
   <!-- ==================== classpath setting ============================ -->
   <path id="idlclasspath">
+    <pathelement location="${env.URE_JAVADIR}/jurt.jar"/>
+    <pathelement location="${env.URE_JAVADIR}/juh.jar"/>
+    <pathelement location="${env.URE_JAVADIR}/ridl.jar"/>
     <pathelement location="${solar.jar}/unoil.jar"/> 
-    <pathelement location="${solar.jar}/jurt.jar"/>
-    <pathelement location="${solar.jar}/juh.jar"/>
-    <pathelement location="${solar.jar}/ridl.jar"/>
     <pathelement location="${out}/class/ScriptFramework.jar"/>
   </path> 
 
Index: java/build.xml
===================================================================
RCS file: /cvs/framework/scripting/java/build.xml,v
retrieving revision 1.34
diff -u -r1.34 build.xml
--- openoffice.org.orig/scripting/java/build.xml	19 Apr 2006 15:06:54 -0000	1.34
+++ openoffice.org/scripting/java/build.xml	26 May 2006 13:33:50 -0000
@@ -52,16 +52,17 @@
 
   <property environment="env"/>
   <property name="env.BSH_JAR" value="${solar.jar}/bsh.jar"/>
+  <property name="env.URE_JAVADIR" value="${solar.jar}"/>
 
   <!-- ==================== classpath setting ============================ -->
   <path id="idlclasspath">
-    <pathelement location="${solar.jar}/jurt.jar"/>
+    <pathelement location="${env.URE_JAVADIR}/jurt.jar"/>
+    <pathelement location="${env.URE_JAVADIR}/juh.jar"/>
+    <pathelement location="${env.URE_JAVADIR}/java_uno.jar"/>
+    <pathelement location="${env.URE_JAVADIR}/ridl.jar"/>
+    <pathelement location="${env.BSH_JAR}"/>
     <pathelement location="${solar.jar}/unoil.jar"/>
     <pathelement location="${solar.jar}/jut.jar"/>
-    <pathelement location="${solar.jar}/juh.jar"/>
-    <pathelement location="${solar.jar}/java_uno.jar"/>
-    <pathelement location="${solar.jar}/ridl.jar"/>
-    <pathelement location="${env.BSH_JAR}"/>
     <pathelement location="${solar.jar}/js.jar"/>
     <pathelement location="${jardir}"/>
   </path> 
Index: source/bridge/build.xml
===================================================================
RCS file: /cvs/xml/xmerge/source/bridge/build.xml,v
retrieving revision 1.2
diff -u -r1.2 build.xml
--- openoffice.org.orig/xmerge/source/bridge/build.xml	24 Oct 2005 16:05:25 -0000	1.2
+++ openoffice.org/xmerge/source/bridge/build.xml	26 May 2006 13:42:23 -0000
@@ -56,13 +56,16 @@
 <project name="XMergeBridge" default="all" basedir=".">
 
     <property file="../inc/antbuild.properties"/>
+
+    <property environment="env"/>
+    <property name="env.URE_JAVADIR" value="${solar.jar}"/>
         
     <path id="classpath">
         <pathelement location="${build.dir}/xmerge.jar"/>
         <pathelement location="${solar.jar}/unoil.jar"/>
-        <pathelement location="${solar.jar}/ridl.jar"/>
-        <pathelement location="${solar.jar}/jurt.jar"/>
-        <pathelement location="${solar.jar}/juh.jar"/>
+        <pathelement location="${env.URE_JAVADIR}/ridl.jar"/>
+        <pathelement location="${env.URE_JAVADIR}/jurt.jar"/>
+        <pathelement location="${env.URE_JAVADIR}/juh.jar"/>
     </path>
 
 
Index: bin/checkdll.sh
===================================================================
RCS file: /cvs/tools/solenv/bin/checkdll.sh,v
retrieving revision 1.8
diff -u -r1.8 checkdll.sh
--- openoffice.org.orig/solenv/bin/checkdll.sh	26 Apr 2006 14:42:21 -0000	1.8
+++ openoffice.org/solenv/bin/checkdll.sh	6 Jun 2006 11:32:30 -0000
@@ -42,7 +42,7 @@
     exit 1
 }
 
-checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll"
+checkdll=`which checkdll`
 
 if [ -x $checkdll ]; then
     while :
Index: bin/modules/installer/regmerge.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/regmerge.pm,v
retrieving revision 1.3
diff -u -r1.3 regmerge.pm
--- openoffice.org.orig/solenv/bin/modules/installer/regmerge.pm	8 Sep 2005 09:09:09 -0000	1.3
+++ openoffice.org/solenv/bin/modules/installer/regmerge.pm	6 Jun 2006 11:32:32 -0000
@@ -139,6 +139,12 @@
 	else { $searchname = "regcomplazy.exe"; } 
 	
 	my $regmergefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, $includepatharrayref, 1);
+	if ( $$regmergefileref eq "" )
+	{ 
+		my @urebindir = ();
+                push(@urebindir, $ENV{'URE_BINDIR'});
+		$regmergefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, \@urebindir, 1);
+	}
 	if ( $$regmergefileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for merging the StarRegistry!", "get_regmerge_file"); }
 	
 	return $$regmergefileref;
Index: bin/modules/installer/servicesfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/servicesfile.pm,v
retrieving revision 1.22
diff -u -r1.22 servicesfile.pm
--- openoffice.org.orig/solenv/bin/modules/installer/servicesfile.pm	11 Nov 2005 10:38:14 -0000	1.22
+++ openoffice.org/solenv/bin/modules/installer/servicesfile.pm	6 Jun 2006 11:32:34 -0000
@@ -349,6 +349,12 @@
 		my $typesrdbref =
 		    get_source_path_cygwin_safe($typesrdbname, $includepatharrayref, 1);
 
+		if ( $$typesrdbref eq "" ) 
+		{
+			my @urerdbdir = ();
+			push(@urerdbdir, $ENV{'URE_RDBDIR'});
+			$typesrdbref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$typesrdbname, \@urerdbdir, 1);
+		}
 		if ( $$typesrdbref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $typesrdbname !", "register_pythoncomponents"); }
 		
 
@@ -533,6 +539,13 @@
 	
 		my $jarfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
 
+                if ( $$jarfileref eq "" )
+                {
+                        my @urejavadir = ();
+                        push(@urejavadir, $ENV{'URE_JAVADIR'});
+                        $jarfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, \@urejavadir, 1);
+                }
+
 		if ( $$jarfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $filename for registering java components!", "prepare_classpath_for_java_registration"); }
 		
 		my $oldclasspathstring = "";
@@ -691,6 +704,13 @@
 	
 	my $filename = "udkapi.rdb";
 	my $udkapirdbref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
+	if ( $$udkapirdbref eq "" ) 
+	{
+		my @urerdbdir = ();
+		push(@urerdbdir, $ENV{'URE_RDBDIR'});
+		$udkapirdbref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, \@urerdbdir, 1);
+	}
+
 	if ( $$udkapirdbref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $filename for creating regcomp.rdb!", "prepare_regcomp_rdb"); }
 
 	my $regcompfilename = "regcomp.rdb";
@@ -707,6 +727,12 @@
 	{
 		my $libfilename = $installer::globals::regcompregisterlibs[$i] . $installer::globals::libextension;
 		my $libfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$libfilename, $includepatharrayref, 1);
+		if ( $$libfileref eq "" ) 
+		{
+			my @urelibdir = ();
+                        push(@urelibdir, $ENV{'URE_LIBDIR'});
+			$libfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$libfilename, \@urelibdir, 1);
+		}
 		if ( $$libfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $libfilename for creating regcomp.rdb!", "prepare_regcomp_rdb"); }
 
 		my $from = cwd();
@@ -782,6 +808,12 @@
 		else { $searchname = "regcomp.exe"; } 
 	
 		$regcompfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, $includepatharrayref, 1);
+		if ( $$regcompfileref eq "" )
+		{
+			my @urebindir = ();
+			push(@urebindir, $ENV{'URE_BINDIR'});
+			$regcompfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, \@urebindir, 1);
+		}
 		if ( $$regcompfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for registering uno components!", "create_services_rdb"); }
 
 		# For Windows the libraries included into the mozruntime.zip have to be added to the path
Index: inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.189
diff -u -r1.189 settings.mk
--- openoffice.org.orig/solenv/inc/settings.mk	4 May 2006 09:24:53 -0000	1.189
+++ openoffice.org/solenv/inc/settings.mk	6 Jun 2006 11:32:35 -0000
@@ -810,11 +806,17 @@
 
 # damit gezielt Abhaengigkeiten auf s: angegeben werden koennen
 
+.IF "$(SYSTEM_URE)"=="YES"
+SOLARRDBDIR=$(URE_RDBDIR)
+SOLARIDLDIR=$(URE_IDLDIR)
+.ELSE
+SOLARRDBDIR=$(SOLARBINDIR)
 .IF "$(common_build)"!=""
 SOLARIDLDIR=$(SOLARVERSION)$/common$(PROEXT)$/idl$(EXT_UPDMINOR)
 .ELSE
 SOLARIDLDIR=$(SOLARVERSION)$/$(INPATH)$/idl$(EXT_UPDMINOR)
 .ENDIF
+.ENDIF
 
 .IF "$(UPDMINOR)" != ""
 EXT_UPDMINOR=.$(UPDMINOR)
@@ -1310,7 +1312,7 @@
 #defaults for UCR HEADER
 UNOUCRBASE*=UCR
 UNOUCROUT*=$(OUT)$/inc
-UNOUCRRDB*=$(SOLARBINDIR)$/types.rdb
+UNOUCRRDB*=$(SOLARRDBDIR)$/types.rdb
 
 # --- Compiler -----------------------------------------------------
 .INCLUDE : rules.mk
Index: inc/target.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/target.mk,v
retrieving revision 1.167.30.1
diff -u -r1.167.30.1 target.mk
--- openoffice.org.orig/solenv/inc/target.mk	18 May 2006 07:51:53 -0000	1.167.30.1
+++ openoffice.org/solenv/inc/target.mk	6 Jun 2006 11:32:37 -0000
@@ -269,6 +269,9 @@
 .IF "$(L10N_framework)"==""
 .IF "$(JARFILES)"!=""
 NEWCLASS:=$(foreach,i,$(JARFILES) $(null,$(shell -+ls -1 $(JARDIR) | $(GREP) "^$i") $(SOLARBINDIR)$/$i $(JARDIR)$/$i))
+.IF "$(URE_JAVADIR)"!=""
+NEWCLASS+=$(foreach,i,$(JARFILES) $(null,$(shell -+ls -1 $(JARDIR) | $(GREP) "^$i") $(URE_JAVADIR)$/$i $(JARDIR)$/$i))
+.ENDIF
 .ENDIF			# "$(JARFILES)"!=""
 .IF "$(EXTRAJARFILES)"!=""
 .IF "$(LOCAL_SOLENV)"!=""
Index: inc/unitools.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unitools.mk,v
retrieving revision 1.45
diff -u -r1.45 unitools.mk
--- openoffice.org.orig/solenv/inc/unitools.mk	31 Mar 2006 10:58:13 -0000	1.45
+++ openoffice.org/solenv/inc/unitools.mk	6 Jun 2006 11:32:37 -0000
@@ -42,7 +42,7 @@
 
 ULFCONV*=ulfconv
 
-MAKEDEPEND*=$(WRAPCMD) $(SOLARBINDIR)$/makedepend
+MAKEDEPEND*=$(WRAPCMD) makedepend
 
 SCP_CHECK_TOOL:=checkscp$E
 
Index: source/bridgetest/makefile.mk
===================================================================
RCS file: /cvs/udk/testtools/source/bridgetest/makefile.mk,v
retrieving revision 1.24
diff -u -r1.24 makefile.mk
--- openoffice.org.orig/testtools/source/bridgetest/makefile.mk	26 Jan 2006 17:40:37 -0000	1.24
+++ openoffice.org/testtools/source/bridgetest/makefile.mk	6 Jun 2006 10:39:07 -0000
@@ -58,6 +58,10 @@
 MY_LOCAL_CLASSDIR=file://$(PWD)$/$(CLASSDIR)
 .ENDIF
 
+.IF "$(URE_JAVADIR)"!=""
+MY_URE_INTERNAL_JAVA_DIR=file://$(URE_JAVADIR)
+.ENDIF
+
 UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
 UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 
Index: util/openoffice.lst
===================================================================
RCS file: /cvs/installation/instsetoo_native/util/openoffice.lst,v
retrieving revision 1.39
diff -u -r1.39 openoffice.lst
--- openoffice.org.orig/instsetoo_native/util/openoffice.lst	7 Apr 2006 14:44:24 -0000	1.39
+++ openoffice.org/instsetoo_native/util/openoffice.lst	6 Jun 2006 13:26:37 -0000
@@ -11,7 +11,6 @@
 			USERDIRPRODUCTVERSION 2
 			REGISTRATIONURL http://www.openoffice.org/welcome/registration20.html
 			UPDATEURL http://update.services.openoffice.org/ProductUpdateService/check.Update
-			ADD_INCLUDE_FILES cliureversion.mk
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
@@ -58,7 +57,6 @@
 			USERDIRPRODUCTVERSION 2
 			REGISTRATIONURL http://www.openoffice.org/welcome/registration20.html
 			UPDATEURL http://update.services.openoffice.org/ProductUpdateService/check.Update
-			ADD_INCLUDE_FILES cliureversion.mk
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
@@ -105,7 +103,6 @@
 			USERDIRPRODUCTVERSION 2
 			REGISTRATIONURL http://www.openoffice.org/welcome/registration20.html
 			UPDATEURL http://update.services.openoffice.org/ProductUpdateService/check.Update
-			ADD_INCLUDE_FILES cliureversion.mk
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
Index: source/unotypes/makefile.mk
===================================================================
RCS file: /cvs/l10n/i18npool/source/unotypes/Attic/makefile.mk,v
retrieving revision 1.15
diff -u -r1.15 makefile.mk
--- openoffice.org.orig/i18npool/source/unotypes/makefile.mk	20 Apr 2006 13:57:16 -0000	1.15
+++ openoffice.org/i18npool/source/unotypes/makefile.mk	3 Jul 2006 09:02:58 -0000
@@ -46,7 +46,7 @@
 
 # ------------------------------------------------------------------
 
-UNOUCRDEP=$(SOLARBINDIR)$/types.rdb makefile.mk
+UNOUCRDEP=$(SOLARRDBDIR)$/types.rdb makefile.mk
 
 # default flags suffice for setup startup without type description manager
 CPPUMAKERFLAGS=
Index: source/localedata/data/makefile.mk
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/data/makefile.mk,v
retrieving revision 1.33
diff -u -r1.33 makefile.mk
--- openoffice.org.orig/i18npool/source/localedata/data/makefile.mk	4 May 2006 09:16:11 -0000	1.33
+++ openoffice.org/i18npool/source/localedata/data/makefile.mk	3 Jul 2006 09:16:21 -0000
@@ -400,6 +400,6 @@
 $(MY_MISC_CXXFILES) : $(BIN)$/saxparser$(EXECPOST)
 
 $(MISC)$/localedata_%.cxx : %.xml
-    +$(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
+    +$(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARRDBDIR)$/types.rdb
     +$(RM) $(BIN)$/$(@:b).rdb
 
Index: unotypes/makefile.mk
===================================================================
RCS file: /cvs/udk/pyuno/unotypes/Attic/makefile.mk,v
retrieving revision 1.2
diff -u -r1.2 makefile.mk
--- openoffice.org.orig/pyuno/unotypes/makefile.mk	8 Sep 2005 16:55:06 -0000	1.2
+++ openoffice.org/pyuno/unotypes/makefile.mk	3 Jul 2006 09:31:57 -0000
@@ -41,8 +41,8 @@
 .INCLUDE :  settings.mk
 #-------------------------------------------------------------------
 
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb 
+UNOUCRDEP=$(SOLARRDBDIR)$/udkapi.rdb
+UNOUCRRDB=$(SOLARRDBDIR)$/udkapi.rdb 
 UNOUCROUT=$(OUT)$/inc
 
 UNOTYPES = \
Index: javamaker/makefile.mk
===================================================================
RCS file: /cvs/udk/unoil/javamaker/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- openoffice.org.orig/unoil/javamaker/makefile.mk	9 Sep 2005 09:25:28 -0000	1.3
+++ openoffice.org/unoil/javamaker/makefile.mk	3 Jul 2006 09:42:50 -0000
@@ -39,8 +39,8 @@
 
 .INCLUDE: settings.mk
 
-RDB = $(SOLARBINDIR)$/offapi.rdb
-EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
+RDB = $(SOLARRDBDIR)$/offapi.rdb
+EXTRA_RDB = $(SOLARRDBDIR)$/udkapi.rdb
 
 .INCLUDE: target.mk
 
Index: source/bridgetest/makefile.mk
===================================================================
RCS file: /cvs/udk/testtools/source/bridgetest/makefile.mk,v
retrieving revision 1.24
diff -u -r1.24 makefile.mk
--- openoffice.org.orig/testtools/source/bridgetest/makefile.mk	26 Jan 2006 17:40:37 -0000	1.24
+++ openoffice.org/testtools/source/bridgetest/makefile.mk	3 Jul 2006 09:53:14 -0000
@@ -58,8 +58,12 @@
 MY_LOCAL_CLASSDIR=file://$(PWD)$/$(CLASSDIR)
 .ENDIF
 
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+.IF "$(URE_JAVADIR)"!=""
+MY_URE_INTERNAL_JAVA_DIR=file://$(URE_JAVADIR)
+.ENDIF
+
+UNOUCRDEP=$(SOLARRDBDIR)$/udkapi.rdb 
+UNOUCRRDB=$(SOLARRDBDIR)$/udkapi.rdb
 
 UNOUCROUT=$(OUT)$/inc
 INCPRE+=$(OUT)$/inc
@@ -156,7 +160,7 @@
 
 #################################################################
 
-$(DLLDEST)$/uno_types.rdb : $(SOLARBINDIR)$/udkapi.rdb
+$(DLLDEST)$/uno_types.rdb : $(SOLARRDBDIR)$/udkapi.rdb
 	echo $(DLLDEST)
 	$(GNUCOPY) -p $? $@
     $(REGMERGE) $@ / $(BIN)$/bridgetest.rdb
@@ -225,7 +229,7 @@
 
 $(MISC)$/$(TARGET)$/bootstrap.rdb .ERRREMOVE:
     - $(MKDIR) $(@:d)
-    + $(COPY) $(SOLARBINDIR)$/types.rdb $@
+    + $(COPY) $(SOLARRDBDIR)$/types.rdb $@
 .IF "$(SOLAR_JAVA)" != ""
     $(REGCOMP) -register -r $@ -c javaloader.uno$(DLLPOST) \
         -c javavm.uno$(DLLPOST) -c uriproc.uno$(DLLPOST)
Index: source/bridgetest/idl/makefile.mk
===================================================================
RCS file: /cvs/udk/testtools/source/bridgetest/idl/makefile.mk,v
retrieving revision 1.6
diff -u -r1.6 makefile.mk
--- openoffice.org.orig/testtools/source/bridgetest/idl/makefile.mk	9 Sep 2005 12:25:47 -0000	1.6
+++ openoffice.org/testtools/source/bridgetest/idl/makefile.mk	3 Jul 2006 09:53:14 -0000
@@ -43,11 +43,11 @@
 ALLTAR: $(MISC)$/$(TARGET).cppumaker.done $(MISC)$/$(TARGET).javamaker.done
 
 $(MISC)$/$(TARGET).cppumaker.done: $(BIN)$/bridgetest.rdb
-    $(CPPUMAKER) -O$(INCCOM) -BUCR $< -X$(SOLARBINDIR)/types.rdb
+    $(CPPUMAKER) -O$(INCCOM) -BUCR $< -X$(SOLARRDBDIR)/types.rdb
     $(TOUCH) $@
 
 $(MISC)$/$(TARGET).javamaker.done: $(BIN)$/bridgetest.rdb
-    $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $<
+    $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARRDBDIR)/types.rdb $<
     $(TOUCH) $@
 
 $(BIN)$/bridgetest.rdb: bridgetest.idl
@@ -67,8 +67,8 @@
 	$(BIN)$/cli_types_bridgetest.dll 
 
 $(BIN)$/cli_types_bridgetest.dll: $(BIN)$/bridgetest.rdb
-    $(CLIMAKER) $(CLIMAKERFLAGS) --out $@ -r $(SOLARBINDIR)$/cli_types.dll \
-		-X $(SOLARBINDIR)$/types.rdb $< 
+    $(CLIMAKER) $(CLIMAKERFLAGS) --out $@ -r $(SOLARRDBDIR)$/cli_types.dll \
+		-X $(SOLARRDBDIR)$/types.rdb $< 
     $(TOUCH) $@
 
 .ENDIF # GUI, WNT
Index: source/inv/makefile.mk
===================================================================
RCS file: /cvs/graphics/goodies/source/inv/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- openoffice.org.orig/goodies/source/inv/makefile.mk	9 Sep 2005 03:07:29 -0000	1.7
+++ openoffice.org/goodies/source/inv/makefile.mk	3 Jul 2006 10:18:18 -0000
@@ -124,9 +124,9 @@
 ALLTAR: \
 	$(BIN)$/applicat.rdb
 
-$(BIN)$/applicat.rdb : makefile.mk $(SOLARBINDIR)$/types.rdb
+$(BIN)$/applicat.rdb : makefile.mk $(SOLARRDBDIR)$/types.rdb
 	rm -f $@
-	$(GNUCOPY) $(SOLARBINDIR)$/types.rdb $@
+	$(GNUCOPY) $(SOLARRDBDIR)$/types.rdb $@
 	+cd $(BIN) && \
 		regcomp -register -r applicat.rdb \
 			-c i18npool.uno$(DLLPOST)
Index: source/backends/gconfbe/makefile.mk
===================================================================
RCS file: /cvs/gsl/shell/source/backends/gconfbe/makefile.mk,v
retrieving revision 1.13
diff -u -r1.13 makefile.mk
--- openoffice.org.orig/shell/source/backends/gconfbe/makefile.mk	22 Mar 2006 09:39:02 -0000	1.13
+++ openoffice.org/shell/source/backends/gconfbe/makefile.mk	3 Jul 2006 10:53:45 -0000
@@ -41,7 +41,7 @@
 ENABLE_EXCEPTIONS=TRUE
 
 COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
+COMPRDB=$(SOLARRDBDIR)$/types.rdb
 UNOUCROUT=$(OUT)$/inc$/$(TARGET)
 INCPRE=$(UNOUCROUT)
 
Index: source/backends/localebe/makefile.mk
===================================================================
RCS file: /cvs/gsl/shell/source/backends/localebe/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- openoffice.org.orig/shell/source/backends/localebe/makefile.mk	7 Sep 2005 19:49:24 -0000	1.5
+++ openoffice.org/shell/source/backends/localebe/makefile.mk	3 Jul 2006 10:53:46 -0000
@@ -42,7 +42,7 @@
 ENABLE_EXCEPTIONS=TRUE
 
 COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
+COMPRDB=$(SOLARRDBDIR)$/types.rdb
 UNOUCROUT=$(OUT)$/inc$/$(TARGET)
 INCPRE=$(UNOUCROUT)
 
Index: source/cmdmail/makefile.mk
===================================================================
RCS file: /cvs/gsl/shell/source/cmdmail/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- openoffice.org.orig/shell/source/cmdmail/makefile.mk	7 Sep 2005 19:52:25 -0000	1.5
+++ openoffice.org/shell/source/cmdmail/makefile.mk	3 Jul 2006 10:53:46 -0000
@@ -39,7 +39,7 @@
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
+COMPRDB=$(SOLARRDBDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 
Index: source/unix/exec/makefile.mk
===================================================================
RCS file: /cvs/gsl/shell/source/unix/exec/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- openoffice.org.orig/shell/source/unix/exec/makefile.mk	7 Sep 2005 19:53:46 -0000	1.8
+++ openoffice.org/shell/source/unix/exec/makefile.mk	3 Jul 2006 10:53:46 -0000
@@ -41,7 +41,7 @@
 ENABLE_EXCEPTIONS=TRUE
 
 COMP1TYPELIST=syssh
-COMPRDB=$(SOLARBINDIR)$/types.rdb
+COMPRDB=$(SOLARRDBDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 
Index: source/makefile.mk
===================================================================
RCS file: /cvs/util/fileaccess/source/makefile.mk,v
retrieving revision 1.10
diff -u -r1.10 makefile.mk
--- openoffice.org.orig/fileaccess/source/makefile.mk	8 Sep 2005 21:23:01 -0000	1.10
+++ openoffice.org/fileaccess/source/makefile.mk	3 Jul 2006 10:56:58 -0000
@@ -40,7 +40,7 @@
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
+COMPRDB=$(SOLARRDBDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  svpre.mk
Index: source/hyphenator/altlinuxhyph/hyphen/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk,v
retrieving revision 1.10
diff -u -r1.10 makefile.mk
--- openoffice.org.orig/lingucomponentsource/hyphenator/altlinuxhyph/hyphen/makefile.mk	2 May 2006 15:39:01 -0000	1.10
+++ opeonoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk	3 Jul 2006 11:12:07 -0000
@@ -63,8 +63,8 @@
 
 # --- Files --------------------------------------------------------
 
-UNOUCRDEP=	$(SOLARBINDIR)$/types.rdb
-UNOUCRRDB=	$(SOLARBINDIR)$/types.rdb
+UNOUCRDEP=	$(SOLARRDBDIR)$/types.rdb
+UNOUCRRDB=	$(SOLARRDBDIR)$/types.rdb
 
 UNOTYPES=\
 	com.sun.star.linguistic2.DictionaryEvent\
Index: source/spellcheck/spell/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/spell/makefile.mk,v
retrieving revision 1.12
diff -u -r1.12 makefile.mk
--- openoffice.org.orig/lingucomponent/source/spellcheck/spell/makefile.mk	2 May 2006 15:39:15 -0000	1.12
+++ openoffice.org/lingucomponent/source/spellcheck/spell/makefile.mk	3 Jul 2006 11:12:08 -0000
@@ -72,8 +72,8 @@
 
 # --- Files --------------------------------------------------------
 
-UNOUCRDEP=	$(SOLARBINDIR)$/types.rdb
-UNOUCRRDB=	$(SOLARBINDIR)$/types.rdb
+UNOUCRDEP=	$(SOLARRDBDIR)$/types.rdb
+UNOUCRRDB=	$(SOLARRDBDIR)$/types.rdb
 
 UNOTYPES=\
 	com.sun.star.linguistic2.DictionaryEvent\
Index: source/thesaurus/libnth/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/thesaurus/libnth/makefile.mk,v
retrieving revision 1.6
diff -u -r1.6 makefile.mk
--- openoffice.org.orig/lingucomponent/source/thesaurus/libnth/makefile.mk	2 May 2006 15:39:25 -0000	1.6
+++ openoffice.org/lingucomponent/source/thesaurus/libnth/makefile.mk	3 Jul 2006 11:12:08 -0000
@@ -66,8 +66,8 @@
 
 # --- Files --------------------------------------------------------
 
-UNOUCRDEP=	$(SOLARBINDIR)$/types.rdb
-UNOUCRRDB=	$(SOLARBINDIR)$/types.rdb
+UNOUCRDEP=	$(SOLARRDBDIR)$/types.rdb
+UNOUCRRDB=	$(SOLARRDBDIR)$/types.rdb
 
 UNOTYPES=\
 	com.sun.star.linguistic2.DictionaryEvent\
Index: source/migration/services/cppumaker.mk
===================================================================
RCS file: /cvs/framework/desktop/source/migration/services/cppumaker.mk,v
retrieving revision 1.3
diff -u -r1.3 cppumaker.mk
--- openoffice.org.orig/desktop/source/migration/services/cppumaker.mk	8 Sep 2005 17:41:18 -0000	1.3
+++ openoffice.org/desktop/source/migration/services/cppumaker.mk	3 Jul 2006 11:24:15 -0000
@@ -33,7 +33,7 @@
 #
 #*************************************************************************
 
-UNOUCRRDB = $(SOLARBINDIR)$/udkapi.rdb $(SOLARBINDIR)$/offapi.rdb
+UNOUCRRDB = $(SOLARRDBDIR)$/udkapi.rdb $(SOLARRDBDIR)$/offapi.rdb
 UNOUCRDEP = $(UNOUCRRDB)
 
 .IF "$(BOOTSTRAP_SERVICE)" != ""
Index: source/basprov/makefile.mk
===================================================================
RCS file: /cvs/framework/scripting/source/basprov/makefile.mk,v
retrieving revision 1.6
diff -u -r1.6 makefile.mk
--- openoffice.org.orig/scripting/source/basprov/makefile.mk	9 Sep 2005 02:24:26 -0000	1.6
+++ openoffice.org/scripting/source/basprov/makefile.mk	3 Jul 2006 12:34:17 -0000
@@ -40,7 +40,7 @@
 NO_BSYMBOLIC=	TRUE
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
+COMPRDB=$(SOLARRDBDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 
Index: source/dlgprov/makefile.mk
===================================================================
RCS file: /cvs/framework/scripting/source/dlgprov/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- openoffice.org.orig/scripting/source/dlgprov/makefile.mk	9 Sep 2005 02:25:40 -0000	1.3
+++ openoffice.org/scripting/source/dlgprov/makefile.mk	3 Jul 2006 12:34:17 -0000
@@ -40,7 +40,7 @@
 NO_BSYMBOLIC=	TRUE
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
+COMPRDB=$(SOLARRDBDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 
Index: source/cnttype/makefile.mk
===================================================================
RCS file: /cvs/gsl/dtrans/source/cnttype/makefile.mk,v
retrieving revision 1.6
diff -u -r1.6 makefile.mk
--- openoffice.org.orig/dtrans/source/cnttype/makefile.mk	8 Sep 2005 18:09:38 -0000	1.6
+++ openoffice.org/dtrans/source/cnttype/makefile.mk	3 Jul 2006 12:41:56 -0000
@@ -39,7 +39,7 @@
 TARGET=mcnttype
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
+COMPRDB=$(SOLARRDBDIR)$/types.rdb
 USE_BOUNDCHK=
 
 .IF "$(USE_BOUNDCHK)"=="TR"
Index: source/analysis/makefile.mk
===================================================================
RCS file: /cvs/sc/scaddins/source/analysis/makefile.mk,v
retrieving revision 1.13
diff -u -r1.13 makefile.mk
--- openoffice.org.orig/scaddins/source/analysis/makefile.mk	8 Sep 2005 23:22:57 -0000	1.13
+++ openoffice.org/scaddins/source/analysis/makefile.mk	3 Jul 2006 15:24:58 -0000
@@ -49,7 +49,7 @@
 
 # --- Types -------------------------------------
 
-UNOUCRRDB=$(SOLARBINDIR)$/types.rdb $(BIN)$/analysisadd.rdb
+UNOUCRRDB=$(SOLARRDBDIR)$/types.rdb $(BIN)$/analysisadd.rdb
 UNOUCRDEP=$(UNOUCRRDB)
 
 UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)$/$(TARGET)
Index: source/datefunc/makefile.mk
===================================================================
RCS file: /cvs/sc/scaddins/source/datefunc/makefile.mk,v
retrieving revision 1.11
diff -u -r1.11 makefile.mk
--- openoffice.org.orig/scaddins/source/datefunc/makefile.mk	8 Sep 2005 23:24:44 -0000	1.11
+++ openoffice.org/scaddins/source/datefunc/makefile.mk	3 Jul 2006 15:24:59 -0000
@@ -48,7 +48,7 @@
 
 # --- Types -------------------------------------
 
-UNOUCRRDB=$(SOLARBINDIR)$/types.rdb $(BIN)$/dateadd.rdb
+UNOUCRRDB=$(SOLARRDBDIR)$/types.rdb $(BIN)$/dateadd.rdb
 UNOUCRDEP=$(UNOUCRRDB)
 
 UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)$/$(TARGET)
Index: source/api/makefile.mk
===================================================================
RCS file: /cvs/graphics/slideshow/source/api/makefile.mk,v
retrieving revision 1.6
diff -u -r1.6 makefile.mk
--- openoffice.org.orig/slideshow/source/api/makefile.mk	11 Oct 2005 08:25:36 -0000	1.6
+++ openoffice.org/slideshow/source/api/makefile.mk	4 Jul 2006 06:37:35 -0000
@@ -58,7 +58,7 @@
 UNOUCRDEP = $(UNOUCRRDB)
 UNOUCROUT = $(OUT)$/inc
 
-CPPUMAKERFLAGS += -C -X$(SOLARBINDIR)$/types.rdb
+CPPUMAKERFLAGS += -C -X$(SOLARRDBDIR)$/types.rdb
 
 UNOTYPES = \
 	com.sun.star.presentation.XSlideShow \
Index: genjava/makefile.mk
===================================================================
RCS file: /cvs/graphics/chart2/genjava/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- openoffice.org.orig/chart2/genjava/makefile.mk	7 Sep 2005 23:58:14 -0000	1.5
+++ openoffice.org/chart2/genjava/makefile.mk	4 Jul 2006 06:58:50 -0000
@@ -44,7 +44,7 @@
 # --- Files --------------------------------------------------------
 
 RDB 		= $(BIN)$/$(PRJNAME).rdb
-EXTRA_RDB   = $(SOLARBINDIR)$/types.rdb
+EXTRA_RDB   = $(SOLARRDBDIR)$/types.rdb
 JAVADIR 	= $(OUT)$/misc$/java
 JARFILES	= ridl.jar
 
Index: util/makefile.mk
===================================================================
RCS file: /cvs/graphics/chart2/util/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- openoffice.org.orig/chart2/util/makefile.mk	25 Oct 2005 11:06:40 -0000	1.3
+++ openoffice.org/chart2/util/makefile.mk	4 Jul 2006 06:59:44 -0000
@@ -62,7 +62,7 @@
 	+$(GNUCOPY) -f $(UCR)$/$(PRJNAME).db $@
 
 $(MISC)$/$(TARGET).don : $(UCR)$/$(PRJNAME).db
-	+$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(UCR)$/$(PRJNAME).db -X$(SOLARBINDIR)$/types.rdb && echo > $@
+	+$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(UCR)$/$(PRJNAME).db -X$(SOLARRDBDIR)$/types.rdb && echo > $@
 	+echo $@
 
 .ENDIF			# "$(L10N_framewor)"==""
--- openoffice.org.orig/solenv/inc/tg_jar.mk	2006-07-04 08:10:50.000000000 +0100
+++ openoffice.org/solenv/inc/tg_jar.mk	2006-07-04 08:10:53.000000000 +0100
@@ -95,6 +95,10 @@
 AOTFILES = $(foreach,i,$(NEWCLASS) $(SOLARLIBDIR)$/lib$(i:b).jar.so)
 AOTLINKFLAGS=$(subst,.so, $(subst,$(SOLARLIBDIR)$/lib,-l $(AOTFILES)))
 
+$(SOLARLIBDIR)$/lib%.jar.so : $(URE_JAVADIR)$/%.jar
+	$(JAVAAOTCOMPILER) -shared -fPIC -Wl,-Bsymbolic -O2 -fno-bounds-check -fno-store-check -findirect-dispatch -fjni -o $@ $<
+
+
 $(SOLARLIBDIR)$/lib%.jar.so : $(SOLARBINDIR)$/%.jar
 	$(JAVAAOTCOMPILER) -shared -fPIC -Wl,-Bsymbolic -O2 --no-bounds-check -fno-store-check -findirect-dispatch -fjni -o $@ $<
 
Index: source/unotypes/makefile.mk
===================================================================
RCS file: /cvs/graphics/sd/source/unotypes/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- openoffice.org.orig/sd/source/unotypes/makefile.mk	9 Sep 2005 07:20:54 -0000	1.3
+++ openoffice.org/sd/source/unotypes/makefile.mk	4 Jul 2006 07:49:08 -0000
@@ -48,7 +48,7 @@
 UNOUCRDEP = $(UNOUCRRDB)
 UNOUCROUT = $(OUT)$/inc
 
-CPPUMAKERFLAGS += -C -X$(SOLARBINDIR)$/types.rdb
+CPPUMAKERFLAGS += -C -X$(SOLARRDBDIR)$/types.rdb
 
 UNOTYPES= \
 	com.sun.star.presentation.XSlideShow \